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

Change-Id: Ie7581b944c0a6aae54103d07cd81c08e301c8c7e