Merge "Camera: don't hold memory map lock during callback" into oc-mr1-dev
am: 60b25e9b56

Change-Id: I31ffa0cf9e51e1190372009dabbd216723a9f25e