Some restructuring of the build was required to support the different

OEM security levels used on tuna vs stingray & crespo. This is part of
the work for b/4598045 Implementing secure video path on TI OMAP4 chip
for ICS.

The Widevine libraries included here, 4.5.0.4321 also contain a fix
for b/4400696 Pinning and unpinning multiple movie for download behavior
is not uniform for multiple tries.

Change-Id: I67f34c06a0353ac7f401f55c1ed4fc2493bc8ab7

proprietary/drmwvmplugin/test/Android.mk

@@ -18,7 +18,6 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport            \
-    libwvdrm              \
     liblog                \
     libutils              \
     libz                  \

proprietary/drmwvmplugin/test/TestPlugin.cpp

@@ -59,7 +59,7 @@ void WVMDrmPluginTest::Run()
     const char *path = "/system/lib/drm/libdrmwvmplugin.so";
     void *handle = dlopen(path, RTLD_NOW);
     if (handle == NULL) {
-        fprintf(stderr, "Can't open plugin: %s\n", path);
+        fprintf(stderr, "Can't open plugin: %s %s\n", path, dlerror());
         exit(-1);
     }