Merge "Fix uchar blur with neon offsets"