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