Revert "Use aidl interface for Widevine service."

This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6

libwvdrmengine/cdm/test/cdm_feature_test.cpp

@@ -17,14 +17,14 @@
 // CDM functionality across a broad range of OEMCrypto implementations
 // and are not intended to be run by partners.
 
-#include <cutils/properties.h>
 #include <errno.h>
 #include <getopt.h>
+#include <sstream>
+
+#include <cutils/properties.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <sstream>
-
 #include "OEMCryptoCENC.h"
 #include "arraysize.h"
 #include "config_test_env.h"
@@ -338,7 +338,7 @@ class WvCdmFeatureTest : public WvCdmTestBase {
     CdmKeyRequest key_request;
     std::string key_set_id;
     license_type_ = license_type;
-    if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) {
+    if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) {
       InitializationData parsed_init_data(init_data_type, init_data);
       parsed_init_data.DumpToLogs();
     }