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

Change-Id: Iabec2f9672193c146fa6514c8f495b8ecdac6d0c