Merge "Allow delta of 1 for srgb format comparsion" into pie-cts-dev am: 2db0a34f05
am: de61b74255

Change-Id: I94546bf1b70d1b147402e736df0fe7ecb103ff90