Merge "MappedFile and FileMap should support zero-length mappings."
am: 5f5ffc8e19

Change-Id: I98b1465f0bf851a611358fb12dff85bc3965cd5e