Merge "Revert "Update clang version to clang-r487747"" am: 7b960074f2

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

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