Merge "Make cts JVMTI tests more consistent"
am: bdc28b75a1

Change-Id: I310d38c458c625cb38a15d32b456bc9fdd43b0b2