[Omit needless words] Don't prefix-strip when dumping APIs.

We're going to delay NS prefix stripping for a bit. Change the API
dump script accordingly, and bump the Swift name lookup table format
version number so this doesn't break everyone who has already run
swift-api-dump.py.

Author: DougGregor

lib/ClangImporter/SwiftLookupTable.h

@@ -51,7 +51,7 @@ const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MAJOR = 1;
 /// Lookup table minor version number.
 ///
 /// When the format changes IN ANY WAY, this number should be incremented.
-const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MINOR = 7; // enum case casing
+const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MINOR = 8; // NS prefix stripping
 
 /// A lookup table that maps Swift names to the set of Clang
 /// declarations with that particular name.

utils/swift-api-dump.py

@@ -242,7 +242,7 @@ def main():
     # Determine the set of extra arguments we'll use.
     extra_args = ['-skip-imports']
     if args.swift_3:
-        extra_args = extra_args + ['-enable-omit-needless-words', '-enable-infer-default-arguments', '-enable-strip-ns-prefix']
+        extra_args = extra_args + ['-enable-omit-needless-words', '-enable-infer-default-arguments']
 
     # Create a .swift file we can feed into swift-ide-test
     subprocess.call(['touch', source_filename])