Merge "base: Add MmapFile as a synonym for MappedFile" am: 727762ef07
am: 26ad5bf069

Change-Id: I24089c26166aefadca6af549724fb03d373913a8