[WIP NOT FOR COMMIT] Switch Android to libc++

third_party/re2/util/util.h

Index: third_party/re2/util/util.h
diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
index 83504454b28c40c38dd8c4ac79f8d1782697904a..1b2450b234323aa72f435a956118e15fd85b2a2b 100644
--- a/third_party/re2/util/util.h
+++ b/third_party/re2/util/util.h
@@ -29,7 +29,6 @@
 #include <utility>
 #include <set>
 
-#include "build/build_config.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 
 // Use std names.
@@ -46,8 +45,7 @@ using std::sort;
 using std::swap;
 using std::make_pair;
 
-#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \
-    !defined(_LIBCPP_ABI_VERSION)
+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(_LIBCPP_ABI_VERSION)
 
 #include <tr1/unordered_set>
 using std::tr1::unordered_set;
@@ -55,7 +53,7 @@ using std::tr1::unordered_set;
 #else
 
 #include <unordered_set>
-#if defined(WIN32) || defined(OS_ANDROID)
+#if defined(WIN32)
 using std::tr1::unordered_set;
 #else
 using std::unordered_set;