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

Change-Id: Ib27d4eabbe9f801a34bd92d3665b738a179908e9