Merge "Update header include for jvmti.h" am: ed5b9691bb
am: 95277a4de5

Change-Id: Icf116033a817ea17de55d978a6e23636b7e886b9