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

* commit 'dab766a7312b1313c89930b5307f33f0baec1549':
  Switch from core to core-libart