Merge "Revert "Rewrite JVMTI method tracing to use trampolines"" am: dca6840055
am: f0a36114f4

Change-Id: Ife869fb914e2081af637c3f328b217a7e47a937c