Merge changes from topic 'more_jvmti_run-test_refactor_java_side'
am: 28728f1f5a

Change-Id: Ieddff1aeabd9c7762bc38776bc27e68fac21aa2f