Merge "Revert "Update header include for jvmti.h""
am: 5378b64af9

Change-Id: I28fef22b86caf3d4ef1138c709f581683ca37c31