Revert CDM changes from oemcrypto 18.4

[ Merge of TBD ]

The merge of oemcrypto-v18 cdm branch to udc-widevine-dev
caused a number of CDM/plugin fixes to be lost.

This undoes the non-oemcrypto changes in http://go/ag/26105061

Bug: 290252845
Test: WVTS, unittests on panther
Change-Id: I2bb99f423bda351eee30276cb0e26e3d9e27fa7d

libwvdrmengine/Android.bp

@@ -216,6 +216,10 @@ cc_library_static {
         "libutils_headers",
     ],
 
+    generated_headers: [
+        "wv_android_build_id",
+    ],
+
     shared_libs: [
         "libbinder_ndk",
         "libcrypto",
@@ -352,3 +356,23 @@ cc_fuzz {
         ],
     },
 }
+
+python_binary_host {
+    name: "wv-android-build-id-gen",
+    srcs: [
+        "wv-android-build-id-gen.py",
+    ],
+    version: {
+        py3: {
+            embedded_launcher: true,
+        },
+    },
+}
+
+genrule {
+    name: "wv_android_build_id",
+    srcs: ["apex/apex_manifest.json"],
+    tools: ["wv-android-build-id-gen"],
+    cmd: "$(location wv-android-build-id-gen) < $(in) > $(out)",
+    out: ["wv_android_build_id.h"],
+}