Merge "Revert "Revert "Cleanup jvmti tests"""