am 51f42b2d: am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"

* commit '51f42b2d20349490c62b9187bde317f25765e9b3':
  imgdiff: Avoid infinite loop if inflate fails