Merge "Fix google-explict-constructor warnings in img_utils." am: c36d401e83
am: efc2112df2

Change-Id: Ia1324682aa827b67f06a52fb1c7743c768b4a910