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

Change-Id: I53a39af134df437207f7b38555561a76e514cd63