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

* commit 'ba5e65057f061f27a58fbb7c5249200910a88033':
  Camera2: Clean up the right streams.