Merge "Add method tracing JVMTI callbacks"
am: 9e20fd6376

Change-Id: I10639738f62efa03412e8eada113bc75e47879c8