llvm-dwp: Streamline duplicate DWO ID diagnostic handling

Actually use the error return path rather than printing the duplicate
information then a separate error. But also just tidy up/deduplicate
some of the code for generating the diagnostic text.

llvm-svn: 269692