swift234

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

This reverts commit r14488, since we're demoting 'type' back to a plain old identifier.

We could consider reallowing 'type' as a contextual keyword here, but from talking to Jordan he was OK with just reverting this functionality.

Swift SVN r14931