Merge "Fix valgrind errors with MemMap::Sync()."
am: c71cc35661

* commit 'c71cc356618b96a215614bc9a89f9429a792efba':
  Fix valgrind errors with MemMap::Sync().