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