Merge "Fix non-run-test jvmti cts tests" am: 2ed1aa94ac am: 373165ebf9
am: 2d62c57db6

Change-Id: I1e6bb37ede7f4cf0d390cc7e8ac3d7b1863a3797