Android CTS 6.0 Release 13 (3530687)
Merge "Add Mips MSA feature to android_getCpuFeatures"