Android CTS 6.0 release 6
Merge "Add Mips MSA feature to android_getCpuFeatures"