Restore disable-features-on-arm.patch to initial approach.

The SIP %If directive only supports OR, so %If(!ANDROID && !ARM)
is not possible. The build failure on Android is most likely also
ARM specific, and will build fine with Android on x86 CPUs.