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

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