Cherry pick 18.4 changes to udc-widevine-dev

Get the udc-widevine-dev Android branch and oemcrypto-v18 cdm branch in
sync. The commit ID for 18.4 on oemcrypto-v18 is
a2f23a2281e5e06dc2867585bdc516fa132b6396.

Merged from go/wvgerrit/190151

Bug: 290252845
Test: WVTS tests are running and passing
Change-Id: I457332e7ca70a5b5169345e1279b3eb9f18413b6

libwvdrmengine/cdm/test/perf_test.h

@@ -0,0 +1,24 @@
+// Copyright 2021 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
+
+#ifndef WVCDM_CDM_TEST_PERF_TEST_H_
+#define WVCDM_CDM_TEST_PERF_TEST_H_
+
+#include <string>
+
+#include "cdm.h"
+
+namespace widevine {
+
+using InitFuncType = Cdm::Status (*)(Cdm::SecureOutputType, Cdm::IStorage*,
+                                     Cdm::IClock*, Cdm::ITimer*, Cdm::ILogger*,
+                                     Cdm::LogLevel);
+using CreateFuncType = Cdm* (*)(Cdm::IEventListener*, Cdm::IStorage*, bool);
+
+int PerfTestMain(InitFuncType init_func, CreateFuncType create_func,
+                 const std::string& cert);
+
+}  // namespace widevine
+
+#endif  // WVCDM_CDM_TEST_PERF_TEST_H_