Snap for 7173131 from 9977663e6b99019a0887b9ae30d266331001162b to ndk-release-r23 am: 0910170d7b

Original change: https://android-review.googlesource.com/c/platform/prebuilts/clang/host/windows-x86/+/1610138

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I620cba22246182c056d866f02e51c5475d0c454c