Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""