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

* commit '1b743777e6b6cec3387b0ee347b6a8a03779c345':
  Revert "[optimizing] Improve x86 shifts"