Merge "Use clang-r412851" am: db1507471c am: 2b59657cbe

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

Change-Id: Iebc09bf04520111faca6aee66d43b9a5f95e46b4