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

Change-Id: I1ea143b961010a23c57e8926d9f1da9de2e49fff