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

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

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