Merge "ffs was not being built for x86."
diff --git a/tests/Android.mk b/tests/Android.mk
index da9d676..1e4ef59 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -126,7 +126,6 @@
# implementation for testing the tests themselves.
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
include $(CLEAR_VARS)
-LOCAL_CXX := /usr/bin/g++ # Avoid the host prebuilt so we test the real glibc.
LOCAL_MODULE := bionic-unit-tests-glibc
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(test_c_flags)