am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"

* commit 'e5571a0ff8217a6fe1b3defdb22295596e36c280':
  imgdiff: fix file descriptor leak