Merge "Include cpufeatures in ndk/Android.mk" into froyo