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

Change-Id: I37ae30006ee7fd5cf3db7b36bd6b968a4b8ef5f6