Merge "Compile with javac by default" am: 262d597530 am: 6d6e0f7c75
am: ec20a71b46

Change-Id: If2dfb91709f8bdab7dc3e7634a7001d78de66e2d