Merge "Use clang-r428724 for clang-tools build" am: 7a08f15efa am: bb60db74cf

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

Change-Id: Iaf4cfb82cd062cd8daeff1f5bdf276865853a027