Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806

libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h

@@ -272,7 +272,7 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
 
   // List this field first so it is destructed last; ensure logging uid
   // is cleared right before plugin is destructed.
-  wvutil::LoggingUidSetter mLoggingUidSetter;
+  wvcdm::LoggingUidSetter mLoggingUidSetter;
 
   struct CryptoSession {
    public:
@@ -487,7 +487,6 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
     void DoTerminate() {
       Mutex::Autolock lock(mLock);
       for_each(mPlugins.begin(), mPlugins.end(), [] (WVDrmPlugin* plugin) {
-        ALOGI("WVDrmPlugin::Terminating plugin %p", (void*)plugin);
         plugin->Close();
       });
       exit(0);