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

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

Change-Id: I12bcfe4cbda18bd0d19832ba90f5ee515ce8f388