Merge "Switch from core to core-libart"