Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev