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