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

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