Remove a couple typedefs for things in the clang namespace with the same name....

Remove a couple typedefs for things in the clang namespace with the same name. Remove a typedef that matches an identical one in the clang namespace.

llvm-svn: 220954