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

Change-Id: I18f7dc2b363856e7709782da4ec2fdd431bde52e