Merge "Revert "Cleanup jvmti tests""