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

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

Change-Id: I2ec5b89020716ebef8ebf5412e711d0bf8a7d998