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

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