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

Change-Id: I69d663c3521cdc95ff9b05593484a78bb7804275