Merge "Camera: synchronize access to mMemoryMap" am: 2b888b349f
am: 623ddbb528

Change-Id: I5b6d641a3cd324b7d2c3078c2d94cbaf0c3a4113