Merge "Fix a rare failure for imgdiff when random data equals gzip header" am:...
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a am: 8542502f am: 233f4b0b
am: 79c1562d
Change-Id: Ice4f792e23043b595e20110d72cab292edc16041