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/cdm_unittests.gypi

@@ -0,0 +1,40 @@
+# Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+#source code may only be used and distributed under the Widevine License
+#Agreement.
+#
+# Include this in any custom unit test targets.
+# Does not include the device certificate or the test runner main.
+{
+  'cflags_cc+': [
+    '-Wno-inconsistent-missing-override',
+  ],
+  'sources': [
+    '../core/test/http_socket.cpp',
+    '../core/test/license_request.cpp',
+    '../core/test/url_request.cpp',
+
+    'test/cdm_test.cpp',
+    'test/cdm_test_printers.cpp',
+    'test/cdm_test_printers.h',
+    'test/test_host.cpp',
+    'test/test_host.h',
+
+    '../util/test/test_sleep.cpp',
+  ],
+  'conditions': [
+    ['support_ota_keybox_functions=="true"', {
+      'sources': [
+        '../core/test/keybox_ota_test.cpp',
+      ],
+    }],
+  ],
+  'include_dirs': [
+    '../core/test',
+    '../util/test',
+  ],
+  'defines': [
+    'UNIT_TEST',
+    'CDM_TESTS',
+  ],
+  'includes': [ '../util/libssl_dependency.gypi' ],
+}