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

Change-Id: I4ebc17f748c287a5416516126f2acfc118ba79f1