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

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