am 3b2bcbf9: Merge "Move RoS allocator to use unordered_set."

* commit '3b2bcbf9daf39f4cece7fde1186f3fa494000ed9':
  Move RoS allocator to use unordered_set.