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

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