x64-upstream: Adjust patches for upstream