Revert "Convert libwvdrmengine to soong."

This change introduced b/38487636 "Distorted video observed when
playing purchased/rented movie in Google play movies & TV app."

Before resubmitting an updated variant of the original CL, please
test playback with Play Movies and the GTS media tests. 

This reverts commit 33f9979b2b.

Change-Id: I4ec2e6fe81323e91e4b62288755c967999e81041

libwvdrmengine/vts/vendor_module/Android.bp

@@ -1,37 +0,0 @@
-//
-// Copyright (C) 2017 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.
-//
-
-cc_library_shared {
-    name: "libvtswidevine",
-    relative_install_path: "drm-vts-test-libs",
-    srcs: [
-        "factory.cpp",
-        "vts_module.cpp",
-    ],
-    include_dirs: [
-        "hardware/interfaces/drm/1.0/vts/functional",
-    ],
-    static_libs: [
-        "libcdm",
-        "libcdm_utils",
-        "libgtest",
-        "libvtswidevine_helpers",
-    ],
-    shared_libs: [
-        "liblog",
-        "libssl",
-    ],
-}

libwvdrmengine/vts/vendor_module/Android.mk

@@ -0,0 +1,40 @@
+# ----------------------------------------------------------------
+# Builds libvtswidevine.so
+#
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := \
+    hardware/interfaces/drm/1.0/vts/functional \
+    vendor/widevine/libwvdrmengine/cdm/include \
+    vendor/widevine/libwvdrmengine/cdm/core/include \
+    vendor/widevine/libwvdrmengine/cdm/core/test \
+    system/libhidl/base/include \
+    system/core/base/include \
+    system/libvintf/include \
+
+LOCAL_SRC_FILES := \
+    factory.cpp \
+    vts_module.cpp \
+    ../../cdm/core/test/url_request.cpp \
+    ../../cdm/core/test/license_request.cpp \
+    ../../cdm/core/test/http_socket.cpp \
+
+LOCAL_STATIC_LIBRARIES := \
+    libgtest \
+    libcdm \
+    libcdm_utils \
+    libcrypto_static
+
+LOCAL_SHARED_LIBRARIES := \
+    libcutils \
+    liblog \
+    libssl \
+    libutils \
+
+LOCAL_MODULE := libvtswidevine
+LOCAL_MODULE_RELATIVE_PATH := drm-vts-test-libs
+LOCAL_MODULE_TAGS := optional
+
+
+include $(BUILD_SHARED_LIBRARY)