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

Change-Id: I8afe0de0abf4e7690860c53592b96575875f6280