Teach simplifycfg to recompute branch weights when merging some branches, and

to discard weights when appropriate. Still more to do (and a new TODO), but
it's a start!

llvm-svn: 147286