Merge \\"Camera3Device: Correctly shut down abandoned streams\\" into nyc-dev am: b889242aff
am: fe82275a06

Change-Id: Id93546464b95e04c5024525e66544f2bb5cb9e35