Merge changes from topic 'more_jvmti_run-test_refactor_java_side' am: 28728f1f5a am: e2f3667591 am: 1db005db97
am: 2a38a8f39b

Change-Id: I93398923d5b391c2e2b85c9a7529f4c6f664b1b0