diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk
index 7a933e00..9a1714cb 100644
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -13,8 +15,6 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_SRC_FILES:= \
     src/WVMDrmPlugin.cpp \
     src/WVMLogging.cpp
@@ -31,8 +31,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm
 
 LOCAL_STATIC_LIBRARIES := \
     libdrmframeworkcommon \
-    libwvocs \
-    liboemcrypto
+    libwvocs
 
 LOCAL_SHARED_LIBRARIES := \
     libutils              \
@@ -43,9 +42,19 @@ LOCAL_SHARED_LIBRARIES := \
     libWVStreamControlAPI
 
 ifneq (,$(filter stingray wingray, $(TARGET_DEVICE)))
+
+# stingray/wingray security lib provided by motorola for widevine
+LOCAL_STATIC_LIBRARIES += \
+    liboemcrypto
+
 LOCAL_SHARED_LIBRARIES += \
     libtpa                \
     libtpa_core
+else
+# for devices that don't support WV drm liboemcrypto.a is not provided by the vendor
+# Use liboemstub instead
+LOCAL_STATIC_LIBRARIES += \
+    liboemstub
 endif
 
 ifeq ($(TARGET_SIMULATOR),true)
@@ -65,4 +74,7 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
+# invoke Android.mk files in subdirs
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
 endif
diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk
new file mode 100644
index 00000000..877fa1fb
--- /dev/null
+++ b/proprietary/drmwvmplugin/lib/Android.mk
@@ -0,0 +1,25 @@
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libwvocs
+LOCAL_SRC_FILES := \
+        libwvocs.a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := liboemstub
+LOCAL_SRC_FILES := \
+        liboemstub.a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+include $(BUILD_PREBUILT)
+
+endif
\ No newline at end of file
diff --git a/proprietary/drmwvmplugin/lib/liboemstub.a b/proprietary/drmwvmplugin/lib/liboemstub.a
new file mode 100644
index 00000000..e45ee7f5
Binary files /dev/null and b/proprietary/drmwvmplugin/lib/liboemstub.a differ
diff --git a/proprietary/streamcontrol/lib/libwvocs.a b/proprietary/drmwvmplugin/lib/libwvocs.a
similarity index 100%
rename from proprietary/streamcontrol/lib/libwvocs.a
rename to proprietary/drmwvmplugin/lib/libwvocs.a
diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk
index 791c4acf..555ff7a9 100644
--- a/proprietary/drmwvmplugin/test/Android.mk
+++ b/proprietary/drmwvmplugin/test/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -31,3 +33,4 @@ LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_EXECUTABLE)
 
+endif
\ No newline at end of file
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index ec48d023..27d7e722 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -12,11 +14,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwvocs
-LOCAL_SRC_FILES := \
-        libwvocs.a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-include $(BUILD_PREBUILT)
+endif
diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk
index d7fdf90a..e37cbebe 100644
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -1,6 +1,7 @@
 ifeq ($(TARGET_ARCH),arm)
 
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk
index 68f8259b..c0136d0a 100644
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -1,9 +1,9 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_SRC_FILES:=           \
     WVMLogging.cpp          \
     WVMExtractorImpl.cpp    \
diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk
index dc237def..255c8832 100644
--- a/proprietary/wvm/test/Android.mk
+++ b/proprietary/wvm/test/Android.mk
@@ -1,4 +1,7 @@
+ifeq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
@@ -25,3 +28,4 @@ LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_EXECUTABLE)
 
+endif