Merge "Use clang-r399163b" am: 887a45bb18

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

Change-Id: Ia0c1c187f419be05876f08b2a588890eff2b736a