Merge "Remove useless map in SwapAllocator"