Change around some manglings to make them carry more information and be easier to demangle.
Change around some manglings to make them carry more
information and be easier to demangle.

Swift SVN r11423

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