Merge "Compile with javac by default"