Respect Client Properties when reporting CDM Status

[ Merge from go/wvgerrit/14286 ]

CDM now reports status information associated with the specified security level.
Earlier information would be reported from the default security level.

b/18709693

Change-Id: I7a01e8ea9773b56951c207437ce85e567fd32b09

libwvdrmengine/cdm/core/include/oemcrypto_adapter.h

@@ -4,11 +4,10 @@
 #define WVCDM_CORE_OEMCRYPTO_ADAPTER_H_
 
 #include "OEMCryptoCENC.h"
+#include "wv_cdm_types.h"
 
 namespace wvcdm {
 
-enum SecurityLevel { kLevelDefault, kLevel3 };
-
 // This attempts to open a session at the desired security level.
 // If one level is not available, the other will be used instead.
 OEMCryptoResult OEMCrypto_OpenSession(OEMCrypto_SESSION* session,