am af2bec33: Merge "[optimizing] Improve x86, x86_64 code"

* commit 'af2bec33e5f124e37e9dbbe0fef1261411bd372d':
  [optimizing] Improve x86, x86_64 code