Merge "test: Fix 4 checker tests to pass with javac/dx" am: afdcd847 am: 908fbc1e am: 3b936555 am: 050dedd6 Change-Id: I69d663c3521cdc95ff9b05593484a78bb7804275