am 2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""

* commit '2b689e370be9f32a88b419edf2d78eb6befade9c':
  Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""