Revert "Use std::set instead of SortedVector"

This reverts commit a03f0debad92921ba52d33e7e06f0064703e85ad.

Reason for revert: cause BB

Change-Id: I5531b895947236ff5754334f3cd4660d07513293
3 files changed