Merge "Add capabilities for jvmti."
am: 5199c11040

Change-Id: I1a76a43aa38c7da3dd07c7043938ac866df00eb7