Merge "Switch bionic-unit-tests to libc++_static."

tests/Android.bp

@@ -366,6 +366,8 @@ cc_defaults {
 
     include_dirs: ["bionic/libc"],
 
+    stl: "libc++_static",
+
     target: {
         android: {
             shared_libs: [

tests/Android.build.mk

@@ -102,11 +102,7 @@ LOCAL_LDLIBS := \
     $($(module)_ldlibs) \
     $($(module)_ldlibs_$(build_type)) \
 
-ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
-  LOCAL_CXX_STL := libc++_static
-else
-  LOCAL_CXX_STL := libc++
-endif
+LOCAL_CXX_STL := libc++_static
 
 ifeq ($(build_type),target)
   include $(BUILD_$(build_target))

tests/libs/Android.bp

@@ -26,6 +26,7 @@ cc_defaults {
     sanitize: {
         never: true,
     },
+    stl: "libc++_static",
     target: {
         darwin: {
             enabled: false,