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

Change-Id: I3003c327899f0d6712f7c5723bc08dd666045b67