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

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