Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and...
Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710 am: 11c794b1
am: 23bb1d21
* commit '23bb1d21':
Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.
Change-Id: Id3e7bd4462b2676e9a5927dd1b3466d9aa539e19