Merge "test: Fix 636-wrong-static-access for javac/dx"