Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev
am: e79124c62b

Change-Id: I351da89fa72d626b2ec2ea580637ea531fa3010b