Android CTS 5.0 release 6
Merge "Switch from core to core-libart"