diff --git a/camera/QCamera/HAL/core/Android.mk b/camera/QCamera/HAL/core/Android.mk
index 68c6930..9622296 100644
--- a/camera/QCamera/HAL/core/Android.mk
+++ b/camera/QCamera/HAL/core/Android.mk
@@ -107,7 +107,7 @@
 
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
         hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw
+        hardware/qcom/media/msm8974/libstagefrighthw
 
 # if debug service layer and up , use stub camera!
 LOCAL_C_INCLUDES += \
diff --git a/camera/QCamera/HAL2/core/Android.mk b/camera/QCamera/HAL2/core/Android.mk
index 1796dda..00b76f2 100644
--- a/camera/QCamera/HAL2/core/Android.mk
+++ b/camera/QCamera/HAL2/core/Android.mk
@@ -55,7 +55,7 @@
 
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
         hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw \
+        hardware/qcom/media/msm8974/libstagefrighthw \
 	system/media/camera/include
 
 # if debug service layer and up , use stub camera!
diff --git a/camera/QCamera/stack/mm-camera-interface/Android.mk b/camera/QCamera/stack/mm-camera-interface/Android.mk
index 13db124..25f68f1 100644
--- a/camera/QCamera/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera/stack/mm-camera-interface/Android.mk
@@ -1,62 +1,62 @@
 #ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
-OLD_LOCAL_PATH := $(LOCAL_PATH)
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-MM_CAM_FILES := \
-        src/mm_camera_interface.c \
-        src/mm_camera_stream.c \
-        src/mm_camera_channel.c \
-        src/mm_camera.c \
-        src/mm_camera_thread.c \
-        src/mm_camera_data.c \
-        src/mm_camera_sock.c \
-        src/mm_camera_helper.c
-
-ifeq ($(strip $(TARGET_USES_ION)),true)
-    LOCAL_CFLAGS += -DUSE_ION
-endif
-
-LOCAL_CFLAGS += -D_ANDROID_
-LOCAL_COPY_HEADERS_TO := mm-camera-interface
-LOCAL_COPY_HEADERS := inc/mm_camera_interface.h
-LOCAL_COPY_HEADERS += ../common/cam_list.h
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-    $(LOCAL_PATH)/../common \
-    $(LOCAL_PATH)/../../../ \
-    $(TARGET_OUT_HEADERS)/mm-camera \
-    $(TARGET_OUT_HEADERS)/mm-camera/common
-
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
-# (BEGIN) Need to remove later once dependency on jpeg removed
-LOCAL_C_INCLUDES += \
-    $(TARGET_OUT_HEADERS)/mm-still \
-    $(TARGET_OUT_HEADERS)/mm-still/jpeg \
-    $(TARGET_OUT_HEADERS)/mm-core/omxcore \
-    $(TARGET_OUT_HEADERS)/mm-still/mm-omx
-# (END) Need to remove later once dependency on jpeg removed
-
-LOCAL_C_INCLUDES+= hardware/qcom/media/mm-core/inc
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
-
-LOCAL_SRC_FILES := $(MM_CAM_FILES)
-
-LOCAL_MODULE           := libmmcamera_interface
-LOCAL_SHARED_LIBRARIES := libdl libcutils liblog
-LOCAL_MODULE_TAGS := optional
-
-# (BEGIN) Need to remove later once dependency on jpeg removed
-# LOCAL_SHARED_LIBRARIES += libmmjpeg_interface
-# (END) Need to remove later once dependency on jpeg removed
-
-include $(BUILD_SHARED_LIBRARY)
-
-LOCAL_PATH := $(OLD_LOCAL_PATH)
-#endif
+OLD_LOCAL_PATH := $(LOCAL_PATH)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+MM_CAM_FILES := \
+        src/mm_camera_interface.c \
+        src/mm_camera_stream.c \
+        src/mm_camera_channel.c \
+        src/mm_camera.c \
+        src/mm_camera_thread.c \
+        src/mm_camera_data.c \
+        src/mm_camera_sock.c \
+        src/mm_camera_helper.c
+
+ifeq ($(strip $(TARGET_USES_ION)),true)
+    LOCAL_CFLAGS += -DUSE_ION
+endif
+
+LOCAL_CFLAGS += -D_ANDROID_
+LOCAL_COPY_HEADERS_TO := mm-camera-interface
+LOCAL_COPY_HEADERS := inc/mm_camera_interface.h
+LOCAL_COPY_HEADERS += ../common/cam_list.h
+
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/inc \
+    $(LOCAL_PATH)/../common \
+    $(LOCAL_PATH)/../../../ \
+    $(TARGET_OUT_HEADERS)/mm-camera \
+    $(TARGET_OUT_HEADERS)/mm-camera/common
+
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+# (BEGIN) Need to remove later once dependency on jpeg removed
+LOCAL_C_INCLUDES += \
+    $(TARGET_OUT_HEADERS)/mm-still \
+    $(TARGET_OUT_HEADERS)/mm-still/jpeg \
+    $(TARGET_OUT_HEADERS)/mm-core/omxcore \
+    $(TARGET_OUT_HEADERS)/mm-still/mm-omx
+# (END) Need to remove later once dependency on jpeg removed
+
+LOCAL_C_INCLUDES+= hardware/qcom/media/msm8974/mm-core/inc
+LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
+LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
+
+LOCAL_SRC_FILES := $(MM_CAM_FILES)
+
+LOCAL_MODULE           := libmmcamera_interface
+LOCAL_SHARED_LIBRARIES := libdl libcutils liblog
+LOCAL_MODULE_TAGS := optional
+
+# (BEGIN) Need to remove later once dependency on jpeg removed
+# LOCAL_SHARED_LIBRARIES += libmmjpeg_interface
+# (END) Need to remove later once dependency on jpeg removed
+
+include $(BUILD_SHARED_LIBRARY)
+
+LOCAL_PATH := $(OLD_LOCAL_PATH)
+#endif
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index 8428e4a..f6a45a1 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -58,7 +58,7 @@
         $(LOCAL_PATH)/stack/common \
         frameworks/native/include/media/hardware \
         frameworks/native/include/media/openmax \
-        hardware/qcom/media/libstagefrighthw \
+        hardware/qcom/media/msm8974/libstagefrighthw \
         system/media/camera/include \
         $(LOCAL_PATH)/../mm-image-codec/qexif \
         $(LOCAL_PATH)/../mm-image-codec/qomx_core \
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index 37f55d1..83fd068 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -41,7 +41,7 @@
 LOCAL_C_INCLUDES+= $(kernel_includes)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 
-LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES += hardware/qcom/media/msm8974/mm-core/inc
 
 ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 17 ))" )))
   LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h