am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting...
am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev
* commit 'a307beb6':
Camera2: Fix deadlock on shutdown due to client getting killed.