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

Change-Id: I50fd0619dec5488dbeadb903b95e5bd4e5980f61