am 48372b54: am e761b911: Merge "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""

* commit '48372b543cbf77835b2df66b1a8a0d88fe1d16f6':
  Revert "Revert "Revert "[optimizing] Improve x86 shifts"""