Merge "test: Fix jvmti tests for javac/dx" am: 4040a40ba1
am: 9392e51221

Change-Id: I5d023874b5ed18cc5020b318b378ab7a10f5795f