Merge "Revert^4 "Rewrite JVMTI method tracing to use trampolines""