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

Change-Id: I17d8daf2c7d51cfe541d1b2364baa2cf2029340c