swift234

Re-apply the series of commits to remove redundantly-serialized conformances.

I can't actually reproduce the buildbot failure that happened last night, so
hopefully it will (a) happen again, so I can investigate, or (b) not happen
again.

Swift SVN r22230