Correct several makefile errors for Android build.

Review URL: http://webrtc-codereview.appspot.com/267024

git-svn-id: http://webrtc.googlecode.com/svn/trunk@986 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_coding/codecs/cng/Android.mk

@@ -28,7 +28,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include 
+    $(LOCAL_PATH)/../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libdl \

src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk

@@ -42,6 +42,13 @@ LOCAL_SRC_FILES := \
     spectrum_ar_model_tables.c \
     transform.c
 
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+LOCAL_SRC_FILES += \
+    filters_neon.c
+LOCAL_CFLAGS += \
+    $(MY_ARM_CFLAGS_NEON)
+endif
+
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)

src/modules/audio_processing/utility/Android.mk

@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := \
     fft4g.c \
     ring_buffer.c \
     delay_estimator.c \
-    delay_estimator_float.c
+    delay_estimator_wrapper.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \