Merge "imgdiff: skip spurious gzip headers in image files"