am 38ea629e: Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev

* commit '38ea629ed2ccba17c763f697ced6d654a42bf699':
  Camera3: Refactor stream code to be DRY