diff --git a/libusbhost/Android.mk b/libusbhost/Android.mk
index 97c1edc18..c9a1c8a30 100644
--- a/libusbhost/Android.mk
+++ b/libusbhost/Android.mk
@@ -30,7 +30,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif
 
-# Static library for target
+# Shared library for target
 # ========================================================
 
 include $(CLEAR_VARS)
@@ -40,4 +40,4 @@ LOCAL_SRC_FILES := usbhost.c
 
 LOCAL_CFLAGS := -g -DUSE_LIBLOG
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 66ebbeff6..bc8c02fb1 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -60,10 +60,7 @@ LOCAL_SRC_FILES:= \
 	toolbox.c \
 	$(patsubst %,%.c,$(TOOLS))
 
-LOCAL_SHARED_LIBRARIES := libcutils libc
-
-# Needed for lsusb.  Should optimize out in linker if lsusb is not included
-LOCAL_STATIC_LIBRARIES := libusbhost
+LOCAL_SHARED_LIBRARIES := libcutils libc libusbhost
 
 LOCAL_MODULE:= toolbox