Merge "Cleanup and consolidate JVMTI event code."
am: 67246e9693

Change-Id: I564da0795f5b6649c28795a1954932fdeefe8366