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

Change-Id: I51b695fcd4bf719ec68104ccb1fbc1ad85241e1e