Merge "Switch to clang-r399163b."