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

Change-Id: Idce2a5e57b4d5bebbe5ee8a4d4736f78a795a2ff