Merge "Use HashSet<std::string> instead of unordered_set<>."
am: 7e56bd41cd

Change-Id: I70be66d103a35e5dffbe6af568b030459b27286d