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

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

Change-Id: I1a0158b52fb5376751d6ac4dd7c6d67b03c78bac