Merge pull request swiftlang#8807 from gottesmm/di_refactoring

[di] Refactor out the handling of DelegatingInit related code out of ElementCollector into its own class.

Author: gottesmm