Merge "Switch another reference from core to core-libart"