Fix many bugs when merging weak-strong and weak-weak pairs. We now merge all

strong functions first to make sure they're the canonical definitions and then
do a second pass looking only for weak functions.

llvm-svn: 113104