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

Change-Id: I6e8e4a5be8db57b60e24a3ca0c160082186eb150