Merge "Revert "Compile with javac by default""
am: 9143549df7

Change-Id: I76ffe1d799adc274ac8f171b897935998e5999ce