Merge "Make javac checkbuilds match jack"