resolved conflicts for merge of cf79c7a5 to master

Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45

diff --cc media/libeffects/downmix/Android.mk
index 2bb6dbe,2bb6dbe..e0ca8af
--- 1/media/libeffects/downmix/Android.mk
--- 2/media/libeffects/downmix/Android.mk
+++ b/media/libeffects/downmix/Android.mk
@@@ -15,16 -15,16 +15,10 @@@ LOCAL_MODULE_TAGS := optiona
  
  LOCAL_MODULE_RELATIVE_PATH := soundfx
  
--ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
--LOCAL_LDLIBS += -ldl
--endif
--
  LOCAL_C_INCLUDES := \
        $(call include-path-for, audio-effects) \
        $(call include-path-for, audio-utils)
  
--LOCAL_PRELINK_MODULE := false
--
  LOCAL_CFLAGS += -fvisibility=hidden
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc media/libeffects/preprocessing/Android.mk
index 9e8cb83,9e8cb83..ea3c59d
--- 1/media/libeffects/preprocessing/Android.mk
--- 2/media/libeffects/preprocessing/Android.mk
+++ b/media/libeffects/preprocessing/Android.mk
@@@ -24,12 -24,12 +24,7 @@@ LOCAL_SHARED_LIBRARIES := 
      libutils \
      liblog
  
--ifeq ($(TARGET_SIMULATOR),true)
--LOCAL_LDLIBS += -ldl
--else
  LOCAL_SHARED_LIBRARIES += libdl
--endif
--
  LOCAL_CFLAGS += -fvisibility=hidden
  
  include $(BUILD_SHARED_LIBRARY)