Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b
am: 79c1562dc9

Change-Id: Ice4f792e23043b595e20110d72cab292edc16041