Merged prebuilt NDKs for different Build OS.

Change-Id: I49e6a5e16bfc4283cc4dbb5770fd74f500609169
diff --git a/libstlport.mk b/libstlport.mk
index 8cc0130..3cbe61f 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -6,7 +6,7 @@
 endif
 
 ifdef LOCAL_NDK_VERSION
-stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/$(BUILD_OS)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
+stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
 LOCAL_C_INCLUDES := \
 	$(stlport_NDK_VERSION_ROOT) \
 	external/stlport/stlport \