Merge "CameraITS: avoid using non-guaranteed stream combination" into lollipop-mr1-cts-dev