am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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