Update build system for rebase.

Change-Id: I361682eefe119e3f7cba22adb4e78eadca61c86b
diff --git a/clang-host-build.mk b/clang-host-build.mk
index e0ba2e6..e116c02 100644
--- a/clang-host-build.mk
+++ b/clang-host-build.mk
@@ -11,12 +11,14 @@
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=	\
 	$(CLANG_ROOT_PATH)/include	\
-        $(CLANG_ROOT_PATH)/lib/CodeGen    \
+	$(CLANG_ROOT_PATH)/lib/CodeGen    \
 	$(LOCAL_C_INCLUDES)
 
 LLVM_ROOT_PATH := external/llvm
 include $(LLVM_ROOT_PATH)/llvm.mk
 
+include external/libcxx/libcxx.mk
+
 ifneq ($(LLVM_HOST_BUILD_MK),)
 include $(LLVM_HOST_BUILD_MK)
 endif
diff --git a/host_shared_clang.mk b/host_shared_clang.mk
index f9e4181..566f3ab 100644
--- a/host_shared_clang.mk
+++ b/host_shared_clang.mk
@@ -26,7 +26,7 @@
 	libclangRewriteCore \
 	libclangSerialization
 
-LOCAL_SHARED_LIBRARIES := libLLVM
+LOCAL_SHARED_LIBRARIES := libLLVM libc++
 
 ifeq ($(HOST_OS),windows)
   LOCAL_LDLIBS := -limagehlp -lpsapi
diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk
index e7af560..aa00a0d 100644
--- a/tools/driver/Android.mk
+++ b/tools/driver/Android.mk
@@ -91,7 +91,8 @@
   libLLVMCore \
   libLLVMOption \
   libLLVMSupport \
-  libLLVMTarget
+  libLLVMTarget \
+  libLLVMProfileData
 
 LOCAL_LDLIBS += -lm
 ifdef USE_MINGW