Merge "Remove InvokeVirtualOrInterface event from instrumentation."
am: 62f14c8b44

Change-Id: I979fb85d0946e4dcfd4eaa63fc91d23794a4faf6