am 4fcaa03f: am 4ef3147a: am 1b743777: Merge "Revert "[optimizing] Improve x86 shifts""

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