Merge "libjpeg should #define __ARM_HAVE_NEON."