Merge "x86_64: Fix wide argument increment"