Merge "Make javac checkbuilds match jack" am: cb8077df16 am: 9f1e58aab9 am: 2e2758b69d
am: 5730186686

Change-Id: Ic50bde66364ef5407f38c0e0ccd7a5278b255513