Merge System into Support.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120298 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/System/Makefile b/unittests/System/Makefile
index 368cf32..096a761 100644
--- a/unittests/System/Makefile
+++ b/unittests/System/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TESTNAME = System
-LINK_COMPONENTS := system support
+LINK_COMPONENTS := support
 
 include $(LEVEL)/Makefile.config
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/unittests/System/Path.cpp b/unittests/System/Path.cpp
index b8a2f63..2b0817f 100644
--- a/unittests/System/Path.cpp
+++ b/unittests/System/Path.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // For now, just test that the header file parses.
-#include "llvm/System/PathV2.h"
+#include "llvm/Support/PathV2.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/System/TimeValue.cpp b/unittests/System/TimeValue.cpp
index d1da5c1..7fd7c9256 100644
--- a/unittests/System/TimeValue.cpp
+++ b/unittests/System/TimeValue.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "gtest/gtest.h"
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/TimeValue.h"
 #include <time.h>
 
 using namespace llvm;