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

Change-Id: I480a29c72eb633dbcd4ee4ecb346b55e3c9b095c