Merge "imgdiff: Avoid infinite loop if inflate fails"