Merge "Update clang version to clang-r487747" am: 1fb80a1dc3

Original change: https://android-review.googlesource.com/c/platform/development/+/2462733

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