diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -111,11 +111,11 @@
         set(LLVM_UTILS_PROVIDED ON)
         set(CLANG_TEST_DEPS FileCheck count not)
       endif()
-      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
+      set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
       if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
           AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
           AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-        add_subdirectory(${UNITTEST_DIR} utils/unittest)
+        add_subdirectory(${UNITTEST_DIR} third-party/unittest)
       endif()
     endif()
 
@@ -526,7 +526,7 @@
 
 
 if( CLANG_INCLUDE_TESTS )
-  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
+  if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
     add_subdirectory(unittests)
     list(APPEND CLANG_TEST_DEPS ClangUnitTests)
     list(APPEND CLANG_TEST_PARAMS
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -639,7 +639,7 @@
 endif()
 
 # Unittests support.
-set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
+set(COMPILER_RT_GTEST_PATH ${LLVM_THIRD_PARTY_DIR}/unittest/googletest)
 set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
 set(COMPILER_RT_GTEST_CFLAGS
   -DGTEST_NO_LLVM_SUPPORT=1
@@ -649,7 +649,7 @@
 )
 
 # Mocking support.
-set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock)
+set(COMPILER_RT_GMOCK_PATH ${LLVM_THIRD_PATY_DIR}/unittest/googlemock)
 set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc)
 set(COMPILER_RT_GMOCK_CFLAGS
   -DGTEST_NO_LLVM_SUPPORT=1
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
--- a/lld/CMakeLists.txt
+++ b/lld/CMakeLists.txt
@@ -68,11 +68,11 @@
         set(LLVM_UTILS_PROVIDED ON)
         set(LLD_TEST_DEPS FileCheck not)
       endif()
-      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
+      set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
       if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
           AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
           AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-        add_subdirectory(${UNITTEST_DIR} utils/unittest)
+        add_subdirectory(${UNITTEST_DIR} third-party/unittest)
       endif()
     else()
       # Seek installed Lit.
diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake
--- a/lldb/cmake/modules/LLDBStandalone.cmake
+++ b/lldb/cmake/modules/LLDBStandalone.cmake
@@ -100,8 +100,8 @@
 if(LLDB_INCLUDE_TESTS)
   # Build the gtest library needed for unittests, if we have LLVM sources
   # handy.
-  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET llvm_gtest)
-    add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/unittest utils/unittest)
+  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest AND NOT TARGET llvm_gtest)
+    add_subdirectory(${LLVM_THIRD_PARTY_DIR}}/utils/unittest third-party/unittest)
   endif()
   # LLVMTestingSupport library is needed for Process/gdb-remote.
   if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -401,7 +401,6 @@
 set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir
 set(LLVM_BINARY_DIR       ${CMAKE_CURRENT_BINARY_DIR}  ) # --prefix
 
-set(LLVM_THIRD_PARTY_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/../third-party)
 
 # Note: LLVM_CMAKE_DIR does not include generated files
 set(LLVM_CMAKE_DIR ${LLVM_MAIN_SRC_DIR}/cmake/modules)
@@ -1194,7 +1193,7 @@
   add_subdirectory(utils/yaml-bench)
   add_subdirectory(utils/split-file)
   if( LLVM_INCLUDE_TESTS )
-    add_subdirectory(utils/unittest)
+    add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest ${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest)
   endif()
 else()
   if ( LLVM_INCLUDE_TESTS )
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1260,3 +1260,6 @@
   append_if(SUPPORTS_FFILE_PREFIX_MAP "-ffile-prefix-map=${source_root}/=${LLVM_SOURCE_PREFIX}" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   add_flag_if_supported("-no-canonical-prefixes" NO_CANONICAL_PREFIXES)
 endif()
+
+set(LLVM_THIRD_PARTY_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/../third-party CACHE STRING
+    "Directory containing third party software used by LLVM (e.g. googletest)")
diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
--- a/mlir/CMakeLists.txt
+++ b/mlir/CMakeLists.txt
@@ -25,11 +25,9 @@
 
   include_directories(${LLVM_INCLUDE_DIRS})
 
-  set(LLVM_MAIN_SRC_DIR ${CMAKE_SOURCE_DIR}/../llvm CACHE PATH
-      "Path to LLVM source tree")
-  set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
+  set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
   if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
-    add_subdirectory(${UNITTEST_DIR} utils/unittest)
+    add_subdirectory(${UNITTEST_DIR} third-party/unittest)
   endif()
 
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
@@ -178,7 +176,7 @@
 if (MLIR_INCLUDE_TESTS)
   add_definitions(-DMLIR_INCLUDE_TESTS)
   add_custom_target(MLIRUnitTests)
-  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
+  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
     add_subdirectory(unittests)
   else()
     message(WARNING "gtest not found, unittests will not be available")
diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -28,10 +28,10 @@
 
   # Enable unit tests if available.
   set(POLLY_GTEST_AVAIL 0)
-  set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest)
+  set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
   if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
     if (NOT TARGET gtest)
-      add_subdirectory(${UNITTEST_DIR} utils/unittest)
+      add_subdirectory(${UNITTEST_DIR} third-party/unittest)
     endif()
     set(POLLY_GTEST_AVAIL 1)
   endif()
diff --git a/llvm/utils/unittest/CMakeLists.txt b/third-party/unittest/CMakeLists.txt
rename from llvm/utils/unittest/CMakeLists.txt
rename to third-party/unittest/CMakeLists.txt
diff --git a/llvm/utils/unittest/UnitTestMain/CMakeLists.txt b/third-party/unittest/UnitTestMain/CMakeLists.txt
rename from llvm/utils/unittest/UnitTestMain/CMakeLists.txt
rename to third-party/unittest/UnitTestMain/CMakeLists.txt
diff --git a/llvm/utils/unittest/UnitTestMain/TestMain.cpp b/third-party/unittest/UnitTestMain/TestMain.cpp
rename from llvm/utils/unittest/UnitTestMain/TestMain.cpp
rename to third-party/unittest/UnitTestMain/TestMain.cpp
diff --git a/llvm/utils/unittest/googlemock/LICENSE.txt b/third-party/unittest/googlemock/LICENSE.txt
rename from llvm/utils/unittest/googlemock/LICENSE.txt
rename to third-party/unittest/googlemock/LICENSE.txt
diff --git a/llvm/utils/unittest/googlemock/README.LLVM b/third-party/unittest/googlemock/README.LLVM
rename from llvm/utils/unittest/googlemock/README.LLVM
rename to third-party/unittest/googlemock/README.LLVM
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h b/third-party/unittest/googlemock/include/gmock/gmock-actions.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
rename to third-party/unittest/googlemock/include/gmock/gmock-actions.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h b/third-party/unittest/googlemock/include/gmock/gmock-cardinalities.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
rename to third-party/unittest/googlemock/include/gmock/gmock-cardinalities.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h b/third-party/unittest/googlemock/include/gmock/gmock-function-mocker.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
rename to third-party/unittest/googlemock/include/gmock/gmock-function-mocker.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h b/third-party/unittest/googlemock/include/gmock/gmock-generated-actions.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
rename to third-party/unittest/googlemock/include/gmock/gmock-generated-actions.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h b/third-party/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
rename to third-party/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h b/third-party/unittest/googlemock/include/gmock/gmock-generated-matchers.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
rename to third-party/unittest/googlemock/include/gmock/gmock-generated-matchers.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h b/third-party/unittest/googlemock/include/gmock/gmock-matchers.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
rename to third-party/unittest/googlemock/include/gmock/gmock-matchers.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h b/third-party/unittest/googlemock/include/gmock/gmock-more-actions.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
rename to third-party/unittest/googlemock/include/gmock/gmock-more-actions.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h b/third-party/unittest/googlemock/include/gmock/gmock-more-matchers.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
rename to third-party/unittest/googlemock/include/gmock/gmock-more-matchers.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h b/third-party/unittest/googlemock/include/gmock/gmock-nice-strict.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
rename to third-party/unittest/googlemock/include/gmock/gmock-nice-strict.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h b/third-party/unittest/googlemock/include/gmock/gmock-spec-builders.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
rename to third-party/unittest/googlemock/include/gmock/gmock-spec-builders.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock.h b/third-party/unittest/googlemock/include/gmock/gmock.h
rename from llvm/utils/unittest/googlemock/include/gmock/gmock.h
rename to third-party/unittest/googlemock/include/gmock/gmock.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
rename to third-party/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
rename to third-party/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h b/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
rename to third-party/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h b/third-party/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
rename to third-party/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h b/third-party/unittest/googlemock/include/gmock/internal/gmock-port.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
rename to third-party/unittest/googlemock/include/gmock/internal/gmock-port.h
diff --git a/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h b/third-party/unittest/googlemock/include/gmock/internal/gmock-pp.h
rename from llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
rename to third-party/unittest/googlemock/include/gmock/internal/gmock-pp.h
diff --git a/llvm/utils/unittest/googlemock/src/gmock-all.cc b/third-party/unittest/googlemock/src/gmock-all.cc
rename from llvm/utils/unittest/googlemock/src/gmock-all.cc
rename to third-party/unittest/googlemock/src/gmock-all.cc
diff --git a/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc b/third-party/unittest/googlemock/src/gmock-cardinalities.cc
rename from llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
rename to third-party/unittest/googlemock/src/gmock-cardinalities.cc
diff --git a/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc b/third-party/unittest/googlemock/src/gmock-internal-utils.cc
rename from llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
rename to third-party/unittest/googlemock/src/gmock-internal-utils.cc
diff --git a/llvm/utils/unittest/googlemock/src/gmock-matchers.cc b/third-party/unittest/googlemock/src/gmock-matchers.cc
rename from llvm/utils/unittest/googlemock/src/gmock-matchers.cc
rename to third-party/unittest/googlemock/src/gmock-matchers.cc
diff --git a/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc b/third-party/unittest/googlemock/src/gmock-spec-builders.cc
rename from llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
rename to third-party/unittest/googlemock/src/gmock-spec-builders.cc
diff --git a/llvm/utils/unittest/googlemock/src/gmock.cc b/third-party/unittest/googlemock/src/gmock.cc
rename from llvm/utils/unittest/googlemock/src/gmock.cc
rename to third-party/unittest/googlemock/src/gmock.cc
diff --git a/llvm/utils/unittest/googletest/LICENSE.TXT b/third-party/unittest/googletest/LICENSE.TXT
rename from llvm/utils/unittest/googletest/LICENSE.TXT
rename to third-party/unittest/googletest/LICENSE.TXT
diff --git a/llvm/utils/unittest/googletest/README.LLVM b/third-party/unittest/googletest/README.LLVM
rename from llvm/utils/unittest/googletest/README.LLVM
rename to third-party/unittest/googletest/README.LLVM
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h b/third-party/unittest/googletest/include/gtest/gtest-death-test.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
rename to third-party/unittest/googletest/include/gtest/gtest-death-test.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h b/third-party/unittest/googletest/include/gtest/gtest-matchers.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
rename to third-party/unittest/googletest/include/gtest/gtest-matchers.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-message.h b/third-party/unittest/googletest/include/gtest/gtest-message.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-message.h
rename to third-party/unittest/googletest/include/gtest/gtest-message.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h b/third-party/unittest/googletest/include/gtest/gtest-param-test.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
rename to third-party/unittest/googletest/include/gtest/gtest-param-test.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h b/third-party/unittest/googletest/include/gtest/gtest-printers.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
rename to third-party/unittest/googletest/include/gtest/gtest-printers.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h b/third-party/unittest/googletest/include/gtest/gtest-spi.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
rename to third-party/unittest/googletest/include/gtest/gtest-spi.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h b/third-party/unittest/googletest/include/gtest/gtest-test-part.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
rename to third-party/unittest/googletest/include/gtest/gtest-test-part.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h b/third-party/unittest/googletest/include/gtest/gtest-typed-test.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
rename to third-party/unittest/googletest/include/gtest/gtest-typed-test.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest.h b/third-party/unittest/googletest/include/gtest/gtest.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest.h
rename to third-party/unittest/googletest/include/gtest/gtest.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h b/third-party/unittest/googletest/include/gtest/gtest_pred_impl.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
rename to third-party/unittest/googletest/include/gtest/gtest_pred_impl.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h b/third-party/unittest/googletest/include/gtest/gtest_prod.h
rename from llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
rename to third-party/unittest/googletest/include/gtest/gtest_prod.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h b/third-party/unittest/googletest/include/gtest/internal/custom/gtest-port.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
rename to third-party/unittest/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h b/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
rename to third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h b/third-party/unittest/googletest/include/gtest/internal/custom/gtest.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
rename to third-party/unittest/googletest/include/gtest/internal/custom/gtest.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h b/third-party/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
rename to third-party/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h b/third-party/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h b/third-party/unittest/googletest/include/gtest/internal/gtest-filepath.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h b/third-party/unittest/googletest/include/gtest/internal/gtest-internal.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-internal.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h b/third-party/unittest/googletest/include/gtest/internal/gtest-param-util.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h b/third-party/unittest/googletest/include/gtest/internal/gtest-port-arch.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/third-party/unittest/googletest/include/gtest/internal/gtest-port.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-port.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h b/third-party/unittest/googletest/include/gtest/internal/gtest-string.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-string.h
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h b/third-party/unittest/googletest/include/gtest/internal/gtest-type-util.h
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
rename to third-party/unittest/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/llvm/utils/unittest/googletest/src/gtest-all.cc b/third-party/unittest/googletest/src/gtest-all.cc
rename from llvm/utils/unittest/googletest/src/gtest-all.cc
rename to third-party/unittest/googletest/src/gtest-all.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-death-test.cc b/third-party/unittest/googletest/src/gtest-death-test.cc
rename from llvm/utils/unittest/googletest/src/gtest-death-test.cc
rename to third-party/unittest/googletest/src/gtest-death-test.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-filepath.cc b/third-party/unittest/googletest/src/gtest-filepath.cc
rename from llvm/utils/unittest/googletest/src/gtest-filepath.cc
rename to third-party/unittest/googletest/src/gtest-filepath.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-internal-inl.h b/third-party/unittest/googletest/src/gtest-internal-inl.h
rename from llvm/utils/unittest/googletest/src/gtest-internal-inl.h
rename to third-party/unittest/googletest/src/gtest-internal-inl.h
diff --git a/llvm/utils/unittest/googletest/src/gtest-matchers.cc b/third-party/unittest/googletest/src/gtest-matchers.cc
rename from llvm/utils/unittest/googletest/src/gtest-matchers.cc
rename to third-party/unittest/googletest/src/gtest-matchers.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-port.cc b/third-party/unittest/googletest/src/gtest-port.cc
rename from llvm/utils/unittest/googletest/src/gtest-port.cc
rename to third-party/unittest/googletest/src/gtest-port.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-printers.cc b/third-party/unittest/googletest/src/gtest-printers.cc
rename from llvm/utils/unittest/googletest/src/gtest-printers.cc
rename to third-party/unittest/googletest/src/gtest-printers.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-test-part.cc b/third-party/unittest/googletest/src/gtest-test-part.cc
rename from llvm/utils/unittest/googletest/src/gtest-test-part.cc
rename to third-party/unittest/googletest/src/gtest-test-part.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-typed-test.cc b/third-party/unittest/googletest/src/gtest-typed-test.cc
rename from llvm/utils/unittest/googletest/src/gtest-typed-test.cc
rename to third-party/unittest/googletest/src/gtest-typed-test.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest.cc b/third-party/unittest/googletest/src/gtest.cc
rename from llvm/utils/unittest/googletest/src/gtest.cc
rename to third-party/unittest/googletest/src/gtest.cc