Switch benchmarks and tests to libc++.

Change-Id: I3b9c8f8c14a1e227e67ae1977cc29b0e8fccef5d
diff --git a/tests/Android.mk b/tests/Android.mk
index 448a8dc..d946d30 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -271,10 +271,10 @@
     libBionicTests \
 
 bionic-unit-tests-static_static_libraries := \
-    libstlport_static \
     libm \
     libc \
-    libstdc++ \
+    libc++_static \
+    libdl \
     libtinyxml2 \
     liblog \