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

Change-Id: I95e4541b33d486b68e94ddb93b00b802fe072579