Merge "Revert "[scripts/symbol] Switch to clang-r416183d"" am: 7370ac9126

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

Change-Id: Idef984db6573818ed9b63e209309126593902ebf