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

Change-Id: I45ee1029e9b688ecf266c286ef279ca65365740f