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

Change-Id: I0d79687fe8ee64450bfe2c94437aff7dfc1c407f