Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling

Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546

proprietary/wvm/test/Android.mk

@@ -6,7 +6,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_C_INCLUDES+=                      \
     bionic                              \
-    vendor/widevine/proprietary/wvm/include \
+    vendor/widevine/proprietary/include \
     external/stlport/stlport            \
     frameworks/base/media/libstagefright
 

proprietary/wvm/test/Testlibwvm.cpp

@@ -53,7 +53,7 @@ void TestLibWVM::Load()
     const char *path = "/system/lib/libwvm.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);
     }