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

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