Merge "Revert "Update header include for jvmti.h""