Merge "generic_x86: build using the NDK ABI's processor features"