am 00ee83ff: Merge "Switch from core to core-libart"

* commit '00ee83ff1bd827a852065986ed0da7a3ded57a55':
  Switch from core to core-libart