Merge "Use clang-r412851" am: db1507471c

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

Change-Id: Id0e5f07c71e2e8e45021d9c83698e61f5fce75f4