Merge "Use ARCH_ARM_HAVE_NEON define instead of cpuinfo to detect NEON support."