Merge "Do not pass junit.jar to vogar."