Merges to android Pi release (part 5)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Change build options for make protobuf host tools

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/30381 ]

  Also revert local change to protobuf/extension_set.cc
  This builds after adding -Wno-return-type and -Wno-unused flags.

* OEMCrypto v13 stub

  Author: Rintaro Kuroiwa <rkuroiwa@google.com>

  [ Merge of http://go/wvgerrit/30004 ]

* Remove merge conflict tags

  Author: Edwin Wong <edwinwong@google.com>

  [ Merge of http://go/wvgerrit/30120 ]

  Remove merge conflict tags for http://go/wvgerrit/29880

* Added Android Things ARM provisioning key to L3

  Author: Srujan Gaddam <srujzs@google.com>

  [ Merge of http://go/wvgerrit/29701 ]

  BUG: 63443584

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
      commit in the chain.

Change-Id: Ifd867b491dfda5d67d2e225695535b5af9e18260

libwvdrmengine/Android.mk

@@ -43,9 +43,6 @@ LOCAL_SHARED_LIBRARIES := \
   libwvhidl \
   libbinder \
 
-LOCAL_HEADER_LIBRARIES := \
-  libstagefright_foundation_headers
-
 LOCAL_MODULE := android.hardware.drm@1.0-service.widevine
 LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
 LOCAL_REQUIRED_MODULES := move_widevine_data.sh
@@ -66,21 +63,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_PROPRIETARY_MODULE := true
 
-LOCAL_STATIC_LIBRARIES := libcrypto
+LOCAL_STATIC_LIBRARIES := libcrypto_static
 
 LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
 
-LOCAL_HEADER_LIBRARIES := \
-    libutils_headers \
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog
-
 SRC_DIR := cdm/src
 CORE_SRC_DIR := cdm/core/src
 LOCAL_SRC_FILES := \
@@ -104,10 +94,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_PROPRIETARY_MODULE := true
 
-CORE_PROTO_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
-LOCAL_SRC_FILES := $(CORE_PROTO_SRC_FILES) $(METRICS_PROTO_SRC_FILES)
+LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
 
 generated_sources_dir := $(call local-generated-sources-dir)
 
@@ -170,7 +158,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto \
+  libcrypto_static \
   libjsmn \
   libwvdrmcryptoplugin \
   libwvdrmdrmplugin \
@@ -184,10 +172,6 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   libutils \
 
-LOCAL_HEADER_LIBRARIES := \
-  libutils_headers \
-  libstagefright_headers
-
 LOCAL_MODULE := libwvdrmengine
 
 LOCAL_MODULE_RELATIVE_PATH := mediadrm
@@ -230,7 +214,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto \
+  libcrypto_static \
   libjsmn \
   libwvdrmcryptoplugin_hidl \
   libwvdrmdrmplugin_hidl \