Snap for 7321546 from 85afe8c0b0 to sc-release

Change-Id: I74cba51004fbbea63412981f17dfd1473b99facd

libwvdrmengine/cdm/metrics/src/metrics_collections.cpp

@@ -291,11 +291,11 @@ void OemCryptoDynamicAdapterMetrics::Serialize(
   std::unique_lock<std::mutex> lock(adapter_lock_);
 
   engine_metrics->set_allocated_level3_oemcrypto_initialization_error(
-      oemcrypto_initialization_mode_.ToProto());
+      level3_oemcrypto_initialization_error_.ToProto());
   engine_metrics->set_allocated_oemcrypto_initialization_mode(
       oemcrypto_initialization_mode_.ToProto());
   engine_metrics->set_allocated_previous_oemcrypto_initialization_failure(
-      oemcrypto_initialization_mode_.ToProto());
+      previous_oemcrypto_initialization_failure_.ToProto());
   engine_metrics->set_allocated_oemcrypto_l1_api_version(
       oemcrypto_l1_api_version_.ToProto());
   engine_metrics->set_allocated_oemcrypto_l1_min_api_version(

libwvdrmengine/test/castv2/Android.mk

@@ -17,6 +17,10 @@ LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
+# Disable dexpreopt and <uses-library> check for test.
+LOCAL_ENFORCE_USES_LIBRARIES := false
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))

libwvdrmengine/test/java/MediaDrmApiTest/Android.mk

@@ -11,6 +11,8 @@ LOCAL_LICENSE_CONDITIONS := by_exception_only
 
 LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
 
+# Disable dexpreopt and <uses-library> check for test.
+LOCAL_ENFORCE_USES_LIBRARIES := false
 LOCAL_DEX_PREOPT := false
 
 # When built, explicitly put it in the data/app partition.