Merge "ART: Change StringTable to unordered_set" am: d3784e9d4d
am: d0db7db737

Change-Id: I6bd3f4f24a8ba325f80b139bbd3308c7af5cc192