Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"