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