Merge "Revert^6 "Upgrade to clang-r522817"" into main am: 86cbd9e4 am: ba241b58

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112925



Change-Id: I61dff4aceb8c692215aa21d8c73202fe3b5f0413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>