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

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