Move optimization of some cases of (A & C1)|(B & C2) from instcombine to...

Move optimization of some cases of (A & C1)|(B & C2) from instcombine to instsimplify. Patch by Rahul Jain, plus some last minute changes by me -- you can blame me for any bugs.

llvm-svn: 211252