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

Change-Id: Iaab5e9f47eac406ff70c5dd8df1492e68e9c2d02