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

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

Change-Id: Ied9761ba483d9659cb3084cc9c5024666a11af1f