Merge with Conflict Markers
CONFLICT (content): Merge conflict in clang/lib/Driver/ToolChains/Clang.cpp
CONFLICT (content): Merge conflict in clang/lib/Driver/ToolChains/SYCL.cpp
CONFLICT (content): Merge conflict in clang/test/SemaSYCL/sycl-cconv.cpp