Snap for 4939496 from 89d23c04701125e30d2953768730fe518933135d to pi-qpr1-release

Change-Id: Ia33a26410d0fa37121075695f05f47a8f3bced64
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 79cff33..ef87534 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -108,7 +108,7 @@
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := liblog libcutils libdl
 LOCAL_SHARED_LIBRARIES  += libc2dcolorconvert
-LOCAL_SHARED_LIBRARIES  += libqdMetaData_sdm710
+LOCAL_SHARED_LIBRARIES  += libqdMetaData
 LOCAL_SHARED_LIBRARIES  += libplatformconfig
 
 LOCAL_SRC_FILES         := src/ts_parser.cpp
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 8f7ce94..e86cfe0 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -101,7 +101,7 @@
 # ifeq ($(BOARD_USES_ADRENO), true)
 LOCAL_SHARED_LIBRARIES    += libc2dcolorconvert
 # endif # ($(BOARD_USES_ADRENO), true)
-LOCAL_SHARED_LIBRARIES += libqdMetaData_sdm710
+LOCAL_SHARED_LIBRARIES += libqdMetaData
 LOCAL_STATIC_LIBRARIES    := libOmxVidcCommon
 
 LOCAL_SRC_FILES   := src/omx_video_base.cpp
@@ -136,7 +136,7 @@
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libcutils libdl libplatformconfig libMpeg4SwEncoder
-LOCAL_SHARED_LIBRARIES    += libqdMetaData_sdm710
+LOCAL_SHARED_LIBRARIES    += libqdMetaData
 
 ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_SW_VENC_ROTATION)),true)
 LOCAL_SHARED_LIBRARIES += libui