Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.h
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.h
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.h
@@ -32,7 +32,7 @@
   void inc_use_count_unsafe();
 };
 
-const int kStackDepotMaxUseCount = 1U << 20;
+const int kStackDepotMaxUseCount = 1U << (SANITIZER_ANDROID ? 16 : 20);
 
 StackDepotStats *StackDepotGetStats();
 u32 StackDepotPut(StackTrace stack);
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stackdepot.cc
@@ -26,7 +26,7 @@
   u32 tag;
   uptr stack[1];  // [size]
 
-  static const u32 kTabSizeLog = 20;
+  static const u32 kTabSizeLog = SANITIZER_ANDROID ? 16 : 20;
   // Lower kTabSizeLog bits are equal for all items in one bucket.
   // We use these bits to store the per-stack use counter.
   static const u32 kUseCountBits = kTabSizeLog;