am 519873f3: am d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""

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