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

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