Merge "Use clang-r399163b"