am 3d5e0b20: Merge "Add/Remove mmap tests."

* commit '3d5e0b2045f899e27a071dc228dafc9378e90798':
  Add/Remove mmap tests.