Merge "Optimize x86 long arithmetic"