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

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