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