Merge "Use clang-r399163b" am: 887a45bb18 am: 3c0ad9ac69

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

Change-Id: I737e33d979717945cce44abc59b9169689a9609d