am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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