Merge "test: Fix jvmti tests for javac/dx"