Make javac checkbuilds match jack
am: b16f288bee  -s ours

Change-Id: I0f00f05f62a03562737b657bf037e262b9ca4196