Merge "Revert^2 "Update clang version to clang-r487747"" am: 1784c71446

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

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