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

Change-Id: I48799cabbbf4e4642e9a2bbd802f363f42a71c16