Merge "Update to use clang-r399163." am: c8265d30dc am: 28c67a9aef

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

Change-Id: Ia9833b539d8bc555aa8c1378f5f84a2d4548fb3b