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

Change-Id: Ie4f7ad698f673f80e81db552176f57bdaa32a72e