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

Change-Id: I82ec14ef23f868cd5a4315ed0b7667ca9d2bd75a