Merge "Camera: fix more image copy/compare logic" into pie-cts-dev
am: a1720f0e35

Change-Id: Ic01470845c21634958ba08b7f1107d1528dc69af