Merge "Revert "Compile with javac by default""