diff --git a/libutils/Android.mk b/libutils/Android.mk
index 923d690..1c48619 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -108,11 +108,11 @@
 	libcutils
 
 LOCAL_SHARED_LIBRARIES := \
-        libbacktrace_libc++ \
+        libbacktrace \
         liblog \
         libdl
 
-include external/libcxx/libcxx.mk
+include external/stlport/libstlport.mk
 
 LOCAL_MODULE:= libutils
 include $(BUILD_STATIC_LIBRARY)
@@ -123,12 +123,12 @@
 LOCAL_MODULE:= libutils
 LOCAL_WHOLE_STATIC_LIBRARIES := libutils
 LOCAL_SHARED_LIBRARIES := \
-        libbacktrace_libc++ \
+        libbacktrace \
         libcutils \
         libdl \
         liblog \
 
-include external/libcxx/libcxx.mk
+include external/stlport/libstlport.mk
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index da51a94..caedaff 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -18,6 +18,11 @@
     liblog \
     libcutils \
     libutils \
+    libstlport
+
+static_libraries := \
+    libgtest \
+    libgtest_main
 
 $(foreach file,$(test_src_files), \
     $(eval include $(CLEAR_VARS)) \