am 6d80318c: Merge "[optimizing] Improve x86 shifts"

* commit '6d80318c382a3490ab605b46fa7cb22c5e823fec':
  [optimizing] Improve x86 shifts