diff --git a/libwvdrmengine/mediadrm/test/Android.bp b/libwvdrmengine/mediadrm/test/Android.bp
deleted file mode 100644
index ef81e62a..00000000
--- a/libwvdrmengine/mediadrm/test/Android.bp
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (C) 2020 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.
-
-// -----------------------------------------------------------------------------
-// Builds libwvdrmdrmplugin_test
-//
-cc_test {
-    name: "libwvdrmdrmplugin_test",
-
-    srcs: ["legacy_src/WVDrmPlugin_test.cpp"],
-
-    include_dirs: [
-        "frameworks/av/include",
-        "frameworks/native/include",
-        "vendor/widevine/libwvdrmengine/cdm/core/include",
-        "vendor/widevine/libwvdrmengine/cdm/include",
-        "vendor/widevine/libwvdrmengine/cdm/metrics/include",
-        "vendor/widevine/libwvdrmengine/cdm/util/include",
-        "vendor/widevine/libwvdrmengine/include",
-        "vendor/widevine/libwvdrmengine/mediadrm/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/include",
-    ] + ["external/protobuf/src"],
-    static_libs: [
-        "libcdm",
-        "libcdm_protos",
-        "libcdm_utils",
-        "libjsmn",
-        "libgmock",
-        "libgmock_main",
-        "libgtest",
-        "libwvlevel3",
-        "libwvdrmdrmplugin",
-    ],
-
-    shared_libs: [
-        "libbase",
-        "libcrypto",
-        "libdl",
-        "liblog",
-        "libprotobuf-cpp-lite",
-        "libutils",
-    ],
-
-    header_libs: [
-        "libstagefright_headers",
-        "libstagefright_foundation_headers",
-    ],
-
-    //  - If you don't use gtest, set "gtest: false"
-    //  - Binaries will be installed into /data/nativetest[64]/<name>/<name>
-    //  - Both 32 & 64 bit versions will be built (as appropriate)
-
-    owner: "widevine",
-    proprietary: true,
-}
-
-// -----------------------------------------------------------------------------
-// Builds libwvdrmdrmplugin_hidl_test
-//
-cc_test {
-    name: "libwvdrmdrmplugin_hidl_test",
-
-    srcs: ["WVDrmPlugin_test.cpp"],
-
-    include_dirs: [
-        "frameworks/av/include",
-        "frameworks/native/include",
-        "vendor/widevine/libwvdrmengine/cdm/core/include",
-        "vendor/widevine/libwvdrmengine/cdm/include",
-        "vendor/widevine/libwvdrmengine/cdm/metrics/include",
-        "vendor/widevine/libwvdrmengine/cdm/util/include",
-        "vendor/widevine/libwvdrmengine/include_hidl",
-        "vendor/widevine/libwvdrmengine/include",
-        "vendor/widevine/libwvdrmengine/mediadrm/include_hidl",
-        "vendor/widevine/libwvdrmengine/mediadrm/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/include",
-    ] + ["external/protobuf/src"],
-    static_libs: [
-        "libcdm",
-        "libcdm_protos",
-        "libcdm_utils",
-        "libjsmn",
-        "libgmock",
-        "libgmock_main",
-        "libgtest",
-        "libwvlevel3",
-        "libwvdrmdrmplugin_hidl",
-    ],
-
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "android.hardware.drm@1.1",
-        "android.hardware.drm@1.2",
-        "android.hardware.drm@1.3",
-        "android.hidl.memory@1.0",
-        "libbinder",
-        "libbase",
-        "libcrypto",
-        "libdl",
-        "libhidlbase",
-        "libhidlmemory",
-        "liblog",
-        "libprotobuf-cpp-lite",
-        "libutils",
-    ],
-
-    header_libs: [
-        "libstagefright_headers",
-        "libstagefright_foundation_headers",
-    ],
-
-    //  - If you don't use gtest, set "gtest: false"
-    //  - Binaries will be installed into /data/nativetest[64]/<name>/<name>
-    //  - Both 32 & 64 bit versions will be built (as appropriate)
-
-    owner: "widevine",
-    proprietary: true,
-}
-
-// -----------------------------------------------------------------------------
-// Builds hidl_metrics_adapter_unittest
-//
-cc_test {
-    name: "hidl_metrics_adapter_unittest",
-
-    srcs: ["hidl_metrics_adapter_unittest.cpp"],
-
-    include_dirs: [
-        "vendor/widevine/libwvdrmengine/cdm/core/include",
-        "vendor/widevine/libwvdrmengine/cdm/include",
-        "vendor/widevine/libwvdrmengine/cdm/metrics/include",
-        "vendor/widevine/libwvdrmengine/cdm/util/include",
-        "vendor/widevine/libwvdrmengine/include_hidl",
-        "vendor/widevine/libwvdrmengine/include",
-        "vendor/widevine/libwvdrmengine/mediadrm/include_hidl",
-        "vendor/widevine/libwvdrmengine/mediadrm/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/include",
-    ] + ["external/protobuf/src"],
-    static_libs: [
-        "libcdm",
-        "libcdm_protos",
-        "libcdm_utils",
-        "libgtest",
-        "libgtest_main",
-        "libwvdrmdrmplugin_hidl",
-        "libjsmn",
-        "libwvlevel3",
-        "libwvdrmdrmplugin_hidl",
-    ],
-
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "android.hardware.drm@1.1",
-        "android.hardware.drm@1.2",
-        "android.hidl.memory@1.0",
-        "libcrypto",
-        "libhidlbase",
-        "libhidlmemory",
-        "liblog",
-        "libprotobuf-cpp-lite",
-    ],
-
-    //  - If you don't use gtest, set "gtest: false"
-    //  - Binaries will be installed into /data/nativetest[64]/<name>/<name>
-    //  - Both 32 & 64 bit versions will be built (as appropriate)
-
-    owner: "widevine",
-    proprietary: true,
-}