Merge "Remove unnecessary indirection from MemMap."
am: 88cf462fc3

Change-Id: Ic3eff6c909b591dffc06ac689c315ed5c244fb5e