Merge "camera: add a lock for the request tracker" am: 8c3812f639 am: 421cd310cf
am: 7bac9b0e96

Change-Id: Ie4877dd1169e99fe8e2dcfa64cc9a77de44492ae