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

* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart