[upstream-with-swift] Fix bad merge in 4bee7c556e

The “generalized_swift_name” feature was inadvertently dropped when
resolving a merge conflict. rdar://problem/40779573

apple-llvm-split-commit: a110f67fb25be94908676dff05fe8f0d3b588836
apple-llvm-split-dir: clang/