Build widevide modules with BOARD_VNDK_VERSION

Header libs are added since global include path is not provided when
building with BOARD_VNDK_VERSION. Also, some static libs are marked as
proprietary so that they can be linked against to the drm hal
service.

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.drm@1.0-service.widevine
Change-Id: Iab85869e21917ea212a09d6eaabdb6ba3ace9248

libwvdrmengine/mediacrypto/Android.mk

@@ -18,10 +18,14 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediacrypto/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers
+
 LOCAL_STATIC_LIBRARIES := \
   libcrypto_static \
 
 LOCAL_MODULE := libwvdrmcryptoplugin
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 
@@ -47,6 +51,9 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediacrypto/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers
+
 LOCAL_STATIC_LIBRARIES := \
   libcrypto_static \
   libwidevinehidl_utils \
@@ -57,6 +64,7 @@ LOCAL_SHARED_LIBRARIES := \
   libhidlmemory \
 
 LOCAL_MODULE := libwvdrmcryptoplugin_hidl
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional