[stdlib] Nix an unused protocol and rename another
[stdlib] Nix an unused protocol and rename another

Swift SVN r22791

apple/swift-corelibs-foundation,apple/swift-corelibs-foundation,apple/swift-corelibs-foundation,apple/swift-corelibs-foundation,apple/swift-corelibs-foundation