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

* commit '8b3f8b7594b14063f427c221eafa831d8cde81e6':
  Camera2: Clean up the right streams.