Temporarily use old test keybox

Merge from Widevine repo of http://go/wvgerrit/65922

This CL puts the old 4121 test keybox back into the unit and android
integration tests so that we can run tests on a device with OEMCrypto v13.

This change should not be released, and should not be included in CE CDM.  It
should be removed once we have more test devices with v14 or v15.

Bug: 119313532
Bug: 119316243
Test: unit tests
Test: tested as part of http://go/ag/5501993

Change-Id: If6a459e11176e07c66fbe6fc45c63d87595a20dc

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -225,10 +225,19 @@ void WvCdmTestBase::SetUp() {
 void WvCdmTestBase::InstallTestRootOfTrust() {
   switch (wvoec::global_features.derive_key_method) {
     case wvoec::DeviceFeatures::LOAD_TEST_KEYBOX:
-      ASSERT_EQ(OEMCrypto_SUCCESS,
-                OEMCrypto_LoadTestKeybox(
-                    reinterpret_cast<const uint8_t*>(&wvoec::kTestKeybox),
-                    sizeof(wvoec::kTestKeybox)));
+      // TODO(fredgc, b/119316243): REMOVE THIS! (and the lines below)
+      if (wvoec::global_features.api_version < 14) {
+        // This should work with a production android device, but will fail with
+        // the keyboxless ce cdm, as shipped.  We are including this bit of code
+        // so we can develop on Android, but plan to remove it when we have a
+        // few more android test devices with v14 or v15 oemcrypto.
+        LOGE("Attempting tests without test keybox.");
+      } else { // TODO(fredgc, b/119316243): END OF REMOVE THIS!
+        ASSERT_EQ(OEMCrypto_SUCCESS,
+                  OEMCrypto_LoadTestKeybox(
+                      reinterpret_cast<const uint8_t*>(&wvoec::kTestKeybox),
+                      sizeof(wvoec::kTestKeybox)));
+      }  // TODO(fredgc, b/119316243): yeah, yeah... remove this line, too.
       break;
     case wvoec::DeviceFeatures::LOAD_TEST_RSA_KEY:
       // Rare case: used by devices with baked in DRM cert.