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

* commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8':
  Switch from core to core-libart