swift234

Revert "[stdlib] Land OptionSetType et. al."

This reverts commit r28892, r28894, and r28895.

They broke validation tests; JoeG is going to look at what's needed to
make them work again.

Swift SVN r28897