Merge "Revert^3 "Rewrite JVMTI method tracing to use trampolines""
am: 14daacad75

Change-Id: I4a3ca09f520c558a44dedcef367ef08f4b9af205