Merge "ART: Make run-test-jvmti-java only depend on core" am: 7dd1e683ea
am: db8292455e

Change-Id: I06cc7694723ebd96e33d5aedef3d86ac650f9e58