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