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

* commit '4381767aa6410902e07376f62f66bbef83ebf2c4':
  imgdiff: Avoid infinite loop if inflate fails