am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"

* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart