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

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