Address build breaks

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

Note: WVDrmPlugin.cpp was already modified in
http://go/ag/3995618

Test: tested as part of http://go/ag/4674759

Change-Id: I12d00b73bec140412615f1f843d20b375ba93fa3

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -103,13 +103,14 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
   }
 
   const SecurityLevel requested_security_level =
+      property_set &&
       property_set->security_level().compare(
           wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3) == 0
           ? wvcdm::kLevel3
           : wvcdm::kLevelDefault;
 
   std::string oec_version;
-  sts = cdm_engine_.QueryStatus(requested_security_level,
+  sts = cdm_engine->QueryStatus(requested_security_level,
                                 QUERY_KEY_OEMCRYPTO_API_VERSION,
                                 &oec_version);
   if (sts != NO_ERROR) {