Merge "Switch to clang-r383902"