Merge change I3628c655

* changes:
  OSMemorySystem.mmap fixes.