Android CTS 6.0 Release 25 (4485418)
Merge "Add Mips MSA feature to android_getCpuFeatures"