Merge "Support zero-length mapped files"
am: 2009e32008

Change-Id: I89720d38b64c3ef0143da80e7a26493ef8ff06c6