x64-upstream: Rebase to 273751 to include new ndk