Merge commit '0e35f56d40d3' from llvm.org/main into next

 Conflicts:
	clang/lib/Tooling/DependencyScanning/CMakeLists.txt
	clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Author: qiongsiwu

clang/lib/Tooling/DependencyScanning/CMakeLists.txt

@@ -14,6 +14,7 @@ add_clang_library(clangDependencyScanning
   DependencyScanningWorker.cpp
   DependencyScanningTool.cpp
   IncludeTreeActionController.cpp
+  DependencyScannerImpl.cpp
   InProcessModuleCache.cpp
   ModuleDepCollector.cpp
   ScanAndUpdateArgs.cpp