Handle simple friend-class decls in class templates better by ensuring that

we look for shadow friend decls in the appropriate scope before injecting
a new declaration.

llvm-svn: 99552