Merge "Merge "CameraITS: updates to support openCV 3.2.0 & python 2.7.13" into nougat-cts-dev am: c2d171d4" into nougat-mr1-cts-dev am: 4f4bfcc5 Change-Id: I8854cacedf021688a0e9441fafc042f994a111b3