Revert "Rename aidl_ include and src directories."

This reverts commit 5400741601.

Reason for revert: broke hidl build

Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80

libwvdrmengine/aidl_src/service.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_TAG "WidevineAidlService"
+
+#include <android-base/logging.h>
+#include <android/binder_ibinder_platform.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+
+#include "WVCreatePluginFactories.h"
+#include "WVDrmFactory.h"
+
+using ::wvdrm::hardware::drm::widevine::createDrmFactory;
+using ::wvdrm::hardware::drm::widevine::WVDrmFactory;
+
+int main(int /* argc */, char** /* argv */) {
+  ABinderProcess_setThreadPoolMaxThreadCount(8);
+
+  std::shared_ptr<WVDrmFactory> drmFactory = createDrmFactory();
+
+  const std::string drmInstance =
+      std::string(WVDrmFactory::descriptor) + "/widevine";
+  binder_status_t status = AServiceManager_addService(
+      drmFactory->asBinder().get(), drmInstance.c_str());
+  CHECK(status == STATUS_OK)
+      << "Failed to add Widevine Factory HAL, status=" << status;
+
+  ABinderProcess_joinThreadPool();
+}