Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021'

 Conflicts:
	mm-core/Android.mk

Bug: 149660093
Change-Id: Ib9d6cea6bac9685b5263a4759d631570ce6f1689

diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 0b47c24..3aee33c 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk

@@ -66,11 +66,13 @@
 #===============================================================================
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(LOCAL_PATH)/inc
 LOCAL_C_INCLUDES        += $(TOP)/hardware/qcom/sm8150/media/libplatformconfig
 
 LOCAL_HEADER_LIBRARIES := \
-        libutils_headers
+        libutils_headers \
+        libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_MODULE            := libOmxCore
@@ -99,11 +101,13 @@
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(LOCAL_PATH)/inc
 LOCAL_C_INCLUDES        += $(TOP)/hardware/qcom/sm8150/media/libplatformconfig
 
 LOCAL_HEADER_LIBRARIES := \
-        libutils_headers
+        libutils_headers \
+        libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_MODULE            := libmm-omxcore
@@ -125,4 +129,12 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libomxcore_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+LOCAL_VENDOR_MODULE := true
+
+include $(BUILD_HEADER_LIBRARY)
+
 endif #BUILD_TINY_ANDROID