Merge "Camera: use finer lock in external camera OutputThread" into pi-dev am: aa91a992eb
am: 32ddc82402

Change-Id: I692ad47c134d331252d682ee776b195f7ceabc26