Merge "Ensure jvmtiCapabilities structs are initialized." am: b20a9da907
am: 351fe7017f

Change-Id: If57cb16a54147eee9d811aff9f250f22b5099ed8