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

Change-Id: I1f0dc7d60c9612eeecc30dd9fdf5777a9493f277