x64-upstream: Rebase to 266791 to include upstream fix on lib64