Android 6.0.0 release 4
Merge "Add Mips MSA feature to android_getCpuFeatures"