Merge "[optimizing] Improve x86 shifts"