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

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