Merge "Remove useless map in SwapAllocator"
am: 8a8c84114b

* commit '8a8c84114b16b8971bc2d3c5c7e0e31470d1a68b':
  Remove useless map in SwapAllocator