Accept (and prefer) "import type" as a scoped import for any non-protocol type.

Previously this was spelled "import typealias", and that spelling will
continue to be allowed (since someone may specifically be importing a
typealias and want that to match), but now that 'type' is a keyword,
"import type" is the right way to spell the generic "import any type"
scoped import.

Swift SVN r14488

lib/Parse/ParseDecl.cpp

@@ -819,7 +819,7 @@ void Parser::parseDeclDelayed() {
 ///   decl-import:
 ///     'import' attribute-list import-kind? import-path
 ///   import-kind:
-///     'typealias'
+///     ('type'|'typealias')
 ///     'struct'
 ///     'class'
 ///     'enum'
@@ -847,6 +847,7 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
   SourceLoc KindLoc;
   if (Tok.isKeyword()) {
     switch (Tok.getKind()) {
+    case tok::kw_type:
     case tok::kw_typealias:
       Kind = ImportKind::Type;
       break;