am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"

* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
  Switch from core to core-libart