Merge "Support zero-length mapped files" am: 2009e32008 am: 747e647bd3
am: 4c88d1aec3

Change-Id: I2f19669b7f6d7224497c7c44857b8ed9b2d4e13f