Merge "CameraITS: switch to measure RGB channel noise" into lollipop-mr1-cts-dev