am 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"

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