Fix/suppress unittests broken on Android

cctest/test-threads/ThreadJoinSelf is suppressed for Android, but the
test has since been moved to unittests/Thread.SelfJoin. Move the
suppression to unittests.status.

unittests/ThreadLocalStorageTest.DoTest fails on older Android devices
as it assumes the availability of more TLS slots than many devices
implement. Test a smaller number of slots (32) on Android. Remove old
suppression of test-platform-tls/FastTLS (which no longer exists).

cctest/test-mark-compact/RegressJoinThreadsOnIsolateDeinit can't deal
with shared mappings. Check for 's' instead of '-'.

BUG=v8:3706
LOG=

Review URL: https://codereview.chromium.org/735863003

Cr-Commit-Position: refs/heads/master@{#25492}

test/cctest/cctest.status

@@ -314,12 +314,6 @@
   'test-log/LogAccessorCallbacks': [SKIP],
   'test-log/LogCallbacks': [SKIP],
   'test-log/ProfLazyMode': [SKIP],
-
-  # platform-tls.h does not contain an ANDROID-related header.
-  'test-platform-tls/FastTLS': [SKIP],
-
-  # This test times out.
-  'test-threads/ThreadJoinSelf': [SKIP],
 }],  # 'arch == android_arm or arch == android_ia32'
 
 ##############################################################################

test/cctest/test-mark-compact.cc

@@ -446,7 +446,7 @@ static intptr_t MemoryInUse() {
     bool write_permission = (buffer[position++] == 'w');
     CHECK(buffer[position] == '-' || buffer[position] == 'x');
     bool execute_permission = (buffer[position++] == 'x');
-    CHECK(buffer[position] == '-' || buffer[position] == 'p');
+    CHECK(buffer[position] == 's' || buffer[position] == 'p');
     bool private_mapping = (buffer[position++] == 'p');
     CHECK_EQ(buffer[position++], ' ');
     uintptr_t offset = ReadLong(buffer, &position, 16);

test/unittests/base/platform/platform-unittest.cc

@@ -94,7 +94,13 @@ class ThreadLocalStorageTest : public Thread, public ::testing::Test {
     return reinterpret_cast<void*>(static_cast<uintptr_t>(x + 1));
   }
 
+#if defined(ANDROID)
+  // Older versions of Android have fewer TLS slots (nominally 64, but the
+  // system uses "about 5 of them" itself).
+  Thread::LocalStorageKey keys_[32];
+#else
   Thread::LocalStorageKey keys_[256];
+#endif
 };
 
 }  // namespace

test/unittests/unittests.status

@@ -3,4 +3,11 @@
 # found in the LICENSE file.
 
 [
+
+##############################################################################
+['arch == android_arm or arch == android_ia32', {
+
+  # This test times out.
+  'Thread.SelfJoin': [SKIP],
+}],  # 'arch == android_arm or arch == android_ia32'
 ]