Merge "Fix a rare failure for imgdiff when random data equals gzip header"