Merge "Update clang version to clang-r487747b" am: c741160d am: 0465fd98

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



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