Ensure that the tag decls of friend decls aren't added to the friending class's

decl list, and remove some workarounds that were due to this.  Thanks to Eli for
pointing this out and providing the test case.

llvm-svn: 80745