Merge "Use a HashSet to store delegate references in layoutlib"