Merge "imgdiff: fix file descriptor leak"