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

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