diff --git a/Android.mk b/Android.mk
index 6774b2a..7ec81b1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,21 @@
 	re2/unicode_casefold.cc \
 	re2/unicode_groups.cc
 
+# Stlport version
+# =======================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := libregex-re2
+LOCAL_MODULE_TAGS := optional
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/re2 \
+		    external/stlport
+LOCAL_SRC_FILES := $(regexp_re2_files)
+LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_SDK_VERSION := 14
+include $(BUILD_STATIC_LIBRARY)
+
+# Gnustl+rtti version
+# =======================================================
 include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE := libregex-re2-gnustl-rtti
diff --git a/util/valgrind.h b/util/valgrind.h
index ca10b1a..b52442c 100644
--- a/util/valgrind.h
+++ b/util/valgrind.h
@@ -115,7 +115,7 @@
 #  define PLAT_ppc32_linux 1
 #elif defined(__linux__) && defined(__powerpc__) && defined(__powerpc64__)
 #  define PLAT_ppc64_linux 1
-#elif defined(__linux__) && defined(__arm__)
+#elif defined(__linux__) && defined(__arm__) && !defined(__ARM_ARCH_5__)
 #  define PLAT_arm_linux 1
 #else
 /* If we're not compiling for our target platform, don't generate