Merge "Revert "Use the NDK cpufeatures directly.""