Merge "Correct HAVE_NEON_ASM define"