Merge "Merge "CameraITS: updates to support openCV 3.2.0 & python 2.7.13" into nougat-mr1-cts-dev am: 8d7a3d49cb" into oreo-cts-dev am: eb8df9495d
am: 82acea1f14

Change-Id: I6be0969dca2e539c47f20289794cb8c0be80e8c6