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/wvm/test/Testlibwvm.cpp

@@ -69,7 +69,7 @@ void TestLibWVM::Load()
         LOGE("Failed to locate GetInstance in libwvm.so");
     }
 
-//    dlclose(handle);
+    dlclose(handle);
     printf("Test successful!\n");
     exit(0);
 }