Merge "Use clang-r416183b for clang-tools build" am: 5a81e1cf66 am: fb1cac7d60

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

Change-Id: I0029219b72bb2233aede7dd77d2c0366a5414665