Merge "Revert "Add X86 target changes""
diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
index 57868b2..d342ada 100644
--- a/stlport/stl/config/_android.h
+++ b/stlport/stl/config/_android.h
@@ -87,11 +87,6 @@
 // Android does have include_next but it doesn't work well in our build system.
 #undef _STLP_HAS_INCLUDE_NEXT
 
-// Android X86 target uses GCC 4.2.1 which apparently has this problem
-#if defined(__i386__)
-#   define _STLP_CONST_CONSTRUCTOR_BUG 1
-#endif
-
 #if !defined(__BUILDING_STLPORT)
 // Turn off container extension which fails correct, standard-compliant code.
 // Note: Container extension uses template member function to implement