Merge "Improve x86 long multiply and shifts"