Merge "Moving junit out of core.jar and into core-junit.jar."