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

* commit 'b9b667979a63e3eb1fee259083803f0c87f6ee0f':
  Move RoS allocator to use unordered_set.