swift234

Re-apply "[serialization] Preserve dependencies when merging modules."

This re-applies r13401, reverted in r13404. This wasn't actually causing
problems, but got pulled along with r13400 (reverted in r13405).

Swift SVN r13452