Merge "Remove ARCH_ARM_HAVE_NEON dependency from arm64"