diff --git a/src/modules/audio_processing/aecm/main/source/Android.mk b/src/modules/audio_processing/aecm/main/source/Android.mk
index 9e74623ae4..7dce06b17e 100644
--- a/src/modules/audio_processing/aecm/main/source/Android.mk
+++ b/src/modules/audio_processing/aecm/main/source/Android.mk
@@ -18,8 +18,7 @@ LOCAL_MODULE := libwebrtc_aecm
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_control_mobile.c \
-    aecm_core.c \
-    aecm_delay_estimator.c
+    aecm_core.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
diff --git a/src/modules/audio_processing/utility/Android.mk b/src/modules/audio_processing/utility/Android.mk
index dc967c2271..9ae21e25ec 100644
--- a/src/modules/audio_processing/utility/Android.mk
+++ b/src/modules/audio_processing/utility/Android.mk
@@ -18,7 +18,9 @@ LOCAL_MODULE := libwebrtc_apm_utility
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     fft4g.c \
-    ring_buffer.c
+    ring_buffer.c \
+    delay_estimator.c \
+    delay_estimator_float.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -26,7 +28,9 @@ LOCAL_CFLAGS := \
 
 # Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)
+    $(LOCAL_PATH) \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \