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

Change-Id: I3f790bc4d2051732165df48f2ca1e350ecf799cc