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

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