ART: Change unordered_set to HashSet am: 1459929a7e
am: c74dc3cb56

Change-Id: I60f665e1e4fe65870d2811fa39e4f8e53bf8516b