Merge "Refactor jvmtiEvent so we can add to it."