Fix and recommit r339382 based on solution from RSmith:

As sent on cfe-commits:
 "You need to use "friend TrailingObjects;" here, not 
 "friend class TrailingObjects;", to avoid breaking MSVC 
 (which doesn't implement injected-class-names quite according to spec)."

llvm-svn: 339389