Merge "[base] Make MappedFile work with OS file handles" am: 5f0e5e0ecc
am: 2bb4f40d82

Change-Id: I483e30dfbfcf475e1bff1eed1999c6b4f8de5677