am 3a620bf9: am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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