am 3f5b42f1: Merge "Optimize x86 long arithmetic"

* commit '3f5b42f1d31c877abca2571a51dd0a5055a9b94c':
  Optimize x86 long arithmetic