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/streamcontrol/test/Android.mk

@@ -2,10 +2,11 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-        TestPlayer.cpp
+    TestPlayer.cpp
 
 LOCAL_C_INCLUDES+=                                    \
     bionic                                            \
+    vendor/widevine/proprietary/include               \
     external/stlport/stlport                          \
     vendor/widevine/proprietary/streamcontrol/include \
     vendor/widevine/proprietary/drmwvmplugin/include
@@ -17,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \
     libwvdrm              \
     liblog                \
     libutils              \
-    libz
+    libz                  \
+    libcutils
 
 LOCAL_MODULE:=test-wvplayer
 

proprietary/streamcontrol/test/TestPlayer.cpp

@@ -200,8 +200,7 @@ int main( int argc, char *argv[] )
     bool ptsToMediaTime = false;
     string drmUrl = DEFAULT_DRM_URL;
 
-    // Set up callouts
-    AndroidSetLogCallout(PrintMessage);
+    _ah006(PrintMessage);
 
     // Create DRM plugin object
     sDrmPlugin = WVDRMPluginAPI::create();