am 9e680685: Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev

* commit '9e680685f92752c5c75a2f4929e017aec902aef6':
  camera2: CameraDevice#configureOutputs now deletes unused streams