am 46d4c1cf: am b661a80a: Merge "Move to dalvik.vm.lib.2 to force default to libart"
am 46d4c1cf: am b661a80a: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst