Android CTS 6.0 Release 31 (4890202)
Merge "Add Mips MSA feature to android_getCpuFeatures"