am 4ef3147a: am 1b743777: Merge "Revert "[optimizing] Improve x86 shifts""

* commit '4ef3147ac169d00190d9829a0882f00882f8dbf6':
  Revert "[optimizing] Improve x86 shifts"