Merge "Revert "Revert "Remove junit from our core image."""