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

Change-Id: I8b25db188adbfd44d0f4176e763bc14fd53d19e6