Merge "ART: Refactor libopenjdkjvmti" am: b6b76e4772
am: 237d1ae2d4

Change-Id: Ia1b95f84362814426e4294c18dda783792b5ca22