Merge "Camera2: Clean up the right streams." into jb-mr1-dev