Merge "Camera: synchronize access to mMemoryMap" am: 2b888b349f am: 623ddbb528
am: 7fa903cdaa  -s ours

Change-Id: I1b27cf1f2a4b76aeae3a83303ea2938fd55f13c4