Merge "Remove Mutex dependency from MemMap"
am: f13eb66a93

Change-Id: I01364ec00437771e5bcc03584d7be00ad28e8c08