Merge "Revert "Compile with javac by default"" am: 9143549df7 am: 02e0f6c1db am: 14557ce870
am: 963a68d927

Change-Id: I71135a212dea2141a501fb68f36514493952df90