Merge "Revert^5 "Rewrite JVMTI method tracing to use trampolines"" am: 79deffcd99
am: e4b082f002

Change-Id: Ia00f2457cdad64d6641f3abe9b9db9ff1d4e1c86