Merge "test: Fix 4 checker tests to pass with javac/dx" am: afdcd84749 am: 908fbc1e0d
am: 3b936555f0

Change-Id: Ic40b05ae77ba9b84090c8f3f2463a03ac28de9c8