diff --git a/Android.mk b/Android.mk
index 378a026f27..9cf7033e89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,21 @@
 
 MY_WEBRTC_ROOT_PATH := $(call my-dir)
 
+# These defines will apply to all source files
+# Think again before changing it
+MY_WEBRTC_COMMON_DEFS := \
+    '-DWEBRTC_TARGET_PC' \
+    '-DWEBRTC_LINUX' \
+    '-DWEBRTC_THREAD_RR' \
+    '-DWEBRTC_CLOCK_TYPE_REALTIME' \
+    '-DWEBRTC_ANDROID' \
+    '-DWEBRTC_ANDROID_OPENSLES'
+ifeq ($(TARGET_ARCH),arm)
+MY_WEBRTC_COMMON_DEFS += \
+    '-DWEBRTC_SPL_ARM_INLINE_CALLS' \
+    '-DWEBRTC_ARCH_ARM'
+endif
+
 # voice
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing_library/main/source/Android.mk
@@ -53,10 +68,13 @@ include $(MY_WEBRTC_ROOT_PATH)/libvpx.mk
 # build .so
 include $(MY_WEBRTC_ROOT_PATH)/android-webrtc.mk
 
-# build test apps
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/process_test/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/unit_test/Android.mk 
-include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/cmd_test/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/AutoTest/android/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/android_test/Android.mk
+# test apps, they're for test only; all these test apps have LOCAL_MODULE_TAGS:=tests
+# audio processing test apps
+# include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/process_test/Android.mk
+# include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/unit_test/Android.mk 
+# voice engine test apps
+# include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/cmd_test/Android.mk
+# include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk
+# video engien test apps
+# include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/AutoTest/android/Android.mk
+# include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/android_test/Android.mk
diff --git a/android-webrtc.mk b/android-webrtc.mk
index 294089a6d6..fad2f9656a 100644
--- a/android-webrtc.mk
+++ b/android-webrtc.mk
@@ -24,22 +24,21 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_audio_preprocessing
 LOCAL_MODULE_TAGS := optional
-LOCAL_LDFLAGS :=
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
-	$(MY_APM_WHOLE_STATIC_LIBRARIES) \
-	libwebrtc_system_wrappers \
+    $(MY_APM_WHOLE_STATIC_LIBRARIES) \
+    libwebrtc_system_wrappers \
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
     libstlport 
 
-LOCAL_ADDITIONAL_DEPENDENCIES :=
-
 LOCAL_PRELINK_MODULE := false
 
+ifndef NDK_ROOT
 include external/stlport/libstlport.mk
+endif
 include $(BUILD_SHARED_LIBRARY)
 
 ###
@@ -51,7 +50,6 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc
 LOCAL_MODULE_TAGS := optional
-LOCAL_LDFLAGS :=
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
     libwebrtc_system_wrappers \
@@ -82,7 +80,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
     libwebrtc_jpeg \
     libwebrtc_vpx
 
-LOCAL_STATIC_LIBRARIES := 	
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
@@ -92,9 +89,9 @@ LOCAL_SHARED_LIBRARIES := \
     libOpenSLES \
     libwebrtc_audio_preprocessing
 
-LOCAL_ADDITIONAL_DEPENDENCIES :=
-
 LOCAL_PRELINK_MODULE := false
 
+ifndef NDK_ROOT
 include external/stlport/libstlport.mk
+endif
 include $(BUILD_SHARED_LIBRARY)