Merge "Update to use clang-r399163."