4 files changed, 11 insertions, 8 deletions
diff --git a/libc/bionic/dlmalloc.h b/libc/bionic/dlmalloc.h
index 482fe0e..e065687 100644
--- a/libc/bionic/dlmalloc.h
+++ b/libc/bionic/dlmalloc.h
@@ -32,15 +32,10 @@
 #define USE_SPIN_LOCKS 0
 #define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
 
-__BEGIN_DECLS
-
 /* Export two symbols used by the VM. */
+__BEGIN_DECLS
 int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;
 void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__;
-
-/* NVIDIA's libglcore.so has a reference to dlmalloc_usable_size. TODO: remove this. */
-size_t dlmalloc_usable_size(const void*) __LIBC_ABI_PUBLIC__;
-
 __END_DECLS
 
 /* Include the proper definitions. */
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index c1a0f16..e65ec16 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -18,11 +18,19 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
+ifeq ($(build_type),host)
+# Always make host multilib
+LOCAL_MULTILIB := both
+else
 LOCAL_MULTILIB := $($(module)_multilib)
+endif
+
+ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
 ifeq ($(LOCAL_MULTILIB),both)
     LOCAL_MODULE_STEM_32 := $(module)32
     LOCAL_MODULE_STEM_64 := $(module)64
 endif
+endif
 
 LOCAL_CLANG := $($(module)_clang_$(build_type))
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 56b1ef1..c2e76b6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -365,7 +365,7 @@ include $(LOCAL_PATH)/Android.build.mk
 #   cd bionic/tests; mm bionic-unit-tests-glibc-run
 # -----------------------------------------------------------------------------
 
-ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
 
 bionic-unit-tests-glibc_src_files := \
     atexit_test.cpp \
diff --git a/tests/string_test.cpp b/tests/string_test.cpp
index c62f43b..67b3860 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -812,7 +812,7 @@ TEST(string, __memcmp16) {
       int expected = (static_cast<unsigned short>(c1) - static_cast<unsigned short>(c2));
       int actual = __memcmp16(state.ptr1, state.ptr2, (size_t) state.MAX_LEN);
 
-      ASSERT_EQ(expected, actual);
+      ASSERT_EQ(signum(expected), signum(actual));
     }
   }
 #else // __BIONIC__