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

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

Change-Id: I9d4b0e2ba10a96e2af82122e998246e5f2aaf21b