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

* commit '585a50cecbccf59666dd65e9fc4320eaa3511634':
  imgdiff: fix file descriptor leak