diff --git a/Android.mk b/Android.mk
index 5dbbc1d..36c133c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,9 +44,7 @@
 
 LOCAL_PRELINK_MODULE := false
 
-ifndef NDK_ROOT
 include external/stlport/libstlport.mk
-endif
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -76,9 +74,7 @@
 
 LOCAL_PRELINK_MODULE := false
 
-ifndef NDK_ROOT
 include external/stlport/libstlport.mk
-endif
 include $(BUILD_SHARED_LIBRARY)
 
 
diff --git a/src/common_audio/resampler/Android.mk b/src/common_audio/resampler/Android.mk
index 9d052ed..338a902 100644
--- a/src/common_audio/resampler/Android.mk
+++ b/src/common_audio/resampler/Android.mk
@@ -41,7 +41,6 @@
 
 LOCAL_SHARED_LIBRARIES += libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -50,8 +49,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/common_audio/signal_processing/Android.mk b/src/common_audio/signal_processing/Android.mk
index fc34246..357b1e7 100644
--- a/src/common_audio/signal_processing/Android.mk
+++ b/src/common_audio/signal_processing/Android.mk
@@ -80,9 +80,6 @@
 LOCAL_SRC_FILES_x86_64 += $(my_c_src)
 LOCAL_SRC_FILES_mips64 += $(my_c_src)
 
-LOCAL_SHARED_LIBRARIES += libdl
-
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -91,8 +88,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/common_audio/vad/Android.mk b/src/common_audio/vad/Android.mk
index d13d571..c434e81 100644
--- a/src/common_audio/vad/Android.mk
+++ b/src/common_audio/vad/Android.mk
@@ -44,7 +44,6 @@
 
 LOCAL_SHARED_LIBRARIES += libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -53,8 +52,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
index 75748e5..922800f 100644
--- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -75,13 +75,6 @@
     $(LOCAL_PATH)/../../../../../.. \
     $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
 
-LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libdl
-
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -90,9 +83,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -126,7 +116,6 @@
     $(LOCAL_PATH)/../../../../../.. \
     $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -135,9 +124,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
index d8e685f..12e4b0c 100644
--- a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -1,8 +1,16 @@
-LOCAL_PATH := $(call my-dir)
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
 
 ###########################
 # isac test app
 
+LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := tests
@@ -46,9 +54,6 @@
 
 LOCAL_MODULE:= webrtc_isac_test
 
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -59,4 +64,3 @@
 LOCAL_SHARED_LIBRARIES :=
 endif
 include $(BUILD_NATIVE_TEST)
-endif
diff --git a/src/modules/audio_coding/codecs/isac/main/source/Android.mk b/src/modules/audio_coding/codecs/isac/main/source/Android.mk
index 71df4d5..14a555a 100644
--- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk
@@ -62,11 +62,6 @@
     $(LOCAL_PATH)/../../../../../.. \
     $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
 
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libdl
-
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -75,8 +70,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk
index 8f6bdde..a63cbd6 100644
--- a/src/modules/audio_processing/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -61,7 +61,6 @@
     libcutils \
     libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 include external/stlport/libstlport.mk
 else
@@ -69,9 +68,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -118,10 +114,6 @@
 
 LOCAL_MODULE:= webrtc_apm_process_test
 
-ifdef NDK_ROOT
-LOCAL_SHARED_LIBRARIES += libstlport
-include $(BUILD_EXECUTABLE)
-else
 ifndef WEBRTC_STL
 include external/stlport/libstlport.mk
 else
@@ -130,7 +122,6 @@
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
 include $(BUILD_NATIVE_TEST)
-endif
 
 # apm unit test app
 
@@ -179,10 +170,6 @@
 
 LOCAL_MODULE:= webrtc_apm_unit_test
 
-ifdef NDK_ROOT
-LOCAL_SHARED_LIBRARIES += libstlport
-include $(BUILD_EXECUTABLE)
-else
 ifndef WEBRTC_STL
 include external/stlport/libstlport.mk
 else
@@ -191,4 +178,3 @@
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
 include $(BUILD_NATIVE_TEST)
-endif
diff --git a/src/modules/audio_processing/aec/Android.mk b/src/modules/audio_processing/aec/Android.mk
index ee72c8e..f4d9e16 100644
--- a/src/modules/audio_processing/aec/Android.mk
+++ b/src/modules/audio_processing/aec/Android.mk
@@ -46,7 +46,6 @@
     libdl
 
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -55,8 +54,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk
index fff8f52..c0b6fd5 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -46,7 +46,6 @@
     libcutils \
     libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -55,9 +54,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -89,7 +85,6 @@
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -98,9 +93,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/src/modules/audio_processing/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk
index 6bfd5a6..6fd7d38 100644
--- a/src/modules/audio_processing/agc/Android.mk
+++ b/src/modules/audio_processing/agc/Android.mk
@@ -40,7 +40,6 @@
     libcutils \
     libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -49,8 +48,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk
index 3043e7c..4494ac0 100644
--- a/src/modules/audio_processing/ns/Android.mk
+++ b/src/modules/audio_processing/ns/Android.mk
@@ -48,7 +48,6 @@
     libcutils \
     libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -57,9 +56,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -91,7 +87,6 @@
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -100,9 +95,6 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/src/modules/audio_processing/utility/Android.mk b/src/modules/audio_processing/utility/Android.mk
index 60a6686..4d86d16 100644
--- a/src/modules/audio_processing/utility/Android.mk
+++ b/src/modules/audio_processing/utility/Android.mk
@@ -43,7 +43,6 @@
     libcutils \
     libdl
 
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -52,8 +51,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk
index 4b928b6..ce2555b 100644
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -58,11 +58,6 @@
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/spreadsortlib
 
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libdl
-
-ifndef NDK_ROOT
 ifndef WEBRTC_STL
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
@@ -71,8 +66,5 @@
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
 endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 include $(BUILD_STATIC_LIBRARY)