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