Merge "Update clang version to clang-r487747" am: 29ff4182f5 am: f838a8a4d6

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

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