am eb12847b: Merge "Switch another reference from core to core-libart"

* commit 'eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
  Switch another reference from core to core-libart