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

Change-Id: I45d5e2ccaf84b9c6dffeb5b09409397d6ff6cb07