Merge "Adapt to clang-r353983 changes."