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

Change-Id: Iae9f09cfa4dc86485ebb6f3fe70e999bd0a7fa8e