am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
  Move to dalvik.vm.lib.2 to force default to libart