Enable libc++ on Android

base/containers/hash_tables.h

Index: base/containers/hash_tables.h
diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h
index 6bf029e4565f50c24db91243fe6601252bca8704..a93a81c67108337305634792277a2f4cdffce684 100644
--- a/base/containers/hash_tables.h
+++ b/base/containers/hash_tables.h
@@ -45,7 +45,7 @@
 #undef __DEPRECATED
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && defined(USE_STLPORT)
 #include <hash_map>
 #include <hash_set>
 #define BASE_HASH_IMPL_NAMESPACE std
@@ -84,7 +84,6 @@ struct hash<T*> {
   }
 };
 
-#if !defined(OS_ANDROID)

[Fabrice (no longer in Chrome), 2015/02/04 13:24:22]

Doesn't that need to stay for aosp?

[jdduke (slow), 2015/02/05 18:37:15]

I actually don't know why this was removed, probably a faulty git reset on my
part.

 // The GNU C++ library provides identity hash functions for many integral types,
 // but not for |long long|.  This hash function will truncate if |size_t| is
 // narrower than |long long|.  This is probably good enough for what we will
@@ -102,7 +101,6 @@ DEFINE_TRIVIAL_HASH(long long);
 DEFINE_TRIVIAL_HASH(unsigned long long);
 
 #undef DEFINE_TRIVIAL_HASH
-#endif  // !defined(OS_ANDROID)
 
 // Implement string hash functions so that strings of various flavors can
 // be used as keys in STL maps and sets.  The hash algorithm comes from the