am 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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