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

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