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

Change-Id: Ife69524c4db16ec4740b0ed33ed009a83980f1fe