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

Change-Id: I2241bed24ecbe7f4f3f7578b95e487b56798abef