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