Revert "Move libutils to libc++"

Causes issues in the unbundled branches.

This reverts commit dc133729b0.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a

libutils/Android.mk

@@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \
 	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 @@ include $(CLEAR_VARS)
 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)
 

libutils/tests/Android.mk

@@ -18,6 +18,11 @@ shared_libraries := \
     liblog \
     libcutils \
     libutils \
+    libstlport
+
+static_libraries := \
+    libgtest \
+    libgtest_main
 
 $(foreach file,$(test_src_files), \
     $(eval include $(CLEAR_VARS)) \