Merge "img_utils: fix static analyzer complaints"