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

Change-Id: Icffdc22400644547b878a967938386cc35f6407c