Merge "Camera: don't hold memory map lock during callback" am: 6b1c64d32a
am: 9ca893de79

Change-Id: I7816855e7aa091958220225bad9224e9427bb478