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

Change-Id: I00c491ebe09a942961e70f2caa9c842dea252e1a