Merge "ART: Refactor libopenjdkjvmti"