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

Change-Id: I26b14d021cd8460b057e86a7eefc61345ebbb11b