Merge "img_utils: fix static analyzer complaints" am: 69545369ee am: 5f15fcc82c
am: fdbafb6aa8

Change-Id: I014e82458fa5d1d53ecc78135a95ab43edbcc82e