diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk
index 33eb5d54..60d60370 100644
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -1,6 +1,18 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := libwvdrm
+LOCAL_SRC_FILES := \
+    lib/libwvdrm.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES))
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
+OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
 ifeq ($(TARGET_ARCH),arm)
 
 LOCAL_SRC_FILES:= \
diff --git a/proprietary/streamcontrol/include/WVDRMPluginAPI.h b/proprietary/drmwvmplugin/include/WVDRMPluginAPI.h
similarity index 100%
rename from proprietary/streamcontrol/include/WVDRMPluginAPI.h
rename to proprietary/drmwvmplugin/include/WVDRMPluginAPI.h
diff --git a/proprietary/streamcontrol/lib/libwvdrm.so b/proprietary/drmwvmplugin/lib/libwvdrm.so
similarity index 100%
rename from proprietary/streamcontrol/lib/libwvdrm.so
rename to proprietary/drmwvmplugin/lib/libwvdrm.so
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index bf1f1028..5f47d8ef 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,34 +1,16 @@
-LOCAL_PATH := $(call my-dir)
-
-define _add-wv-shared-lib
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid WV module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $$(TARGET_OUT)$(abspath /lib/$(dir $1))
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $$(BUILD_PREBUILT)
-endef
+LOCAL_PATH:= $(call my-dir)
+ifeq ($(TARGET_ARCH),arm)
 
 include $(CLEAR_VARS)
 
-prebuilt_wv_shared_libs := \
-    libwvdrm.so \
-    libWVStreamControlAPI.so
-
-prebuilt_wv_modules := \
-  $(foreach _file,$(prebuilt_wv_shared_libs),\
-    $(notdir $(basename $(_file))))
-
-LOCAL_MODULE := widevine_proprietary_libs
+LOCAL_MODULE := libWVStreamControlAPI
+LOCAL_SRC_FILES := \
+        libWVStreamControlAPI.so
 LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(prebuilt_wv_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-$(foreach _file,$(prebuilt_wv_shared_libs),\
-  $(eval $(call _add-wv-shared-lib,$(_file))))
-
+LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES))
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
+OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
+include $(BUILD_PREBUILT)
 
+endif
diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk
index 5f36472f..0ae11485 100644
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -4,11 +4,12 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= \
         TestPlayer.cpp
 
-LOCAL_C_INCLUDES+= \
-    bionic                              \
-    vendor/widevine/proprietary/include \
-    external/stlport/stlport            \
-    vendor/widevine/proprietary/streamcontrol/include
+LOCAL_C_INCLUDES+=                                    \
+    bionic                                            \
+    vendor/widevine/proprietary/include               \
+    external/stlport/stlport                          \
+    vendor/widevine/proprietary/streamcontrol/include \
+    vendor/widevine/proprietary/drmwvmplugin/include
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport            \