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

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

Change-Id: I5478e384e3d84bc3f4c53c15b06675ee4945cc30