Merge "Code using neon uses ARCH_ARM_HAVE_NEON."