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

Change-Id: I8455ff91c8e9c0a81e26f438d198feccd1ab237a