Merge "ART: Refactor JVMTI run tests" am: 7201fe3b67
am: 4162514b64

Change-Id: If8dc86155b43bb984e5c09bb9cf056a6044b528e