Merge "Use clang-r433403 for clang-tools build" am: 6cc411b550 am: 2c1959b1b6

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

Change-Id: I01f0d26849ef5bbc5532584edbd79ed93260dac9