[modules] When merging a tag declaration that has a typedef name for linkage

purposes, look for other typedefs with that same name and merge into their
named tag declaration if there is one.

llvm-svn: 216312