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

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

Change-Id: I55e6e40df10807d50631691e4e7e183299389491