Merge "Fix the build for NEON in libpixelflinger"