Revert "Remove Test Keybox Again"

This reverts commit 408509efdc.

Reason for revert: just kidding. We want to run the tests on 
old devices, too.

Change-Id: I920fa825380638122f638e057bcfbe98b5f7b301

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -226,10 +226,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.