diff --git a/.gitupstream b/.gitupstream
new file mode 100644
index 0000000..2be052c
--- /dev/null
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://git.codelinaro.org/clo/la/platform/hardware/qcom/media
diff --git a/Android.mk b/Android.mk
index a99e4c6..60b16cf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-media))
+
 QCOM_MEDIA_ROOT := $(call my-dir)
 
 #Compile these for all targets under QCOM_BOARD_PLATFORMS list.
@@ -7,3 +9,4 @@
     include $(QCOM_MEDIA_ROOT)/libplatformconfig/Android.mk
 endif
 
+endif
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 2c6f83e..7bfca99 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -12,8 +12,6 @@
 OMXCORE_CFLAGS += -DVIDC_STUB_HAL
 endif
 
-QCOM_MEDIA_ROOT ?= hardware/qcom/media
-
 #===============================================================================
 #             Figure out the targets
 #===============================================================================
@@ -35,7 +33,7 @@
 #===============================================================================
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(TOP)/$(QCOM_MEDIA_ROOT)/libplatformconfig
+LOCAL_C_INCLUDES        += $(call project-path-for,qcom-media)/libplatformconfig
 
 LOCAL_HEADER_LIBRARIES := \
         libutils_headers \
@@ -76,7 +74,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(TOP)/$(QCOM_MEDIA_ROOT)/libplatformconfig
+LOCAL_C_INCLUDES        += $(call project-path-for,qcom-media)/libplatformconfig
 
 LOCAL_HEADER_LIBRARIES := \
         libutils_headers \
diff --git a/product.mk b/product.mk
index 790e016..58b7b52 100644
--- a/product.mk
+++ b/product.mk
@@ -15,7 +15,7 @@
 #           QSSI is forcing this to '1'. Must be reverted
 ifeq ($(call is-board-platform-in-list, crow blair bengal neo parrot taro lahaina holi kona), true)
     $(warning "Default Codec2.0 Enabled")
-    PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.ccodec=4
+    PRODUCT_VENDOR_PROPERTIES += debug.stagefright.ccodec=4
 endif
 
 endif