Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr...
Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881
am: a7fca940
* commit 'a7fca940':
Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."
Change-Id: I4075fd84e12f48c2178ab21b78dc3efc7621a6c8