Improves Android support (by David Turner).

test/gtest-filepath_test.cc

@@ -543,6 +543,8 @@ class DirectoryCreationTest : public Test {
       return String(temp_dir);
     else
       return String::Format("%s\\", temp_dir);
+#elif GTEST_OS_LINUX_ANDROID
+    return String("/sdcard/");
 #else
     return String("/tmp/");
 #endif  // GTEST_OS_WINDOWS_MOBILE

test/gtest_unittest.cc

@@ -1275,7 +1275,7 @@ TEST(StringTest, FormatWorks) {
   EXPECT_STREQ("<formatting error or buffer exceeded>",
                String::Format("x%s", buffer).c_str());
 
-#if GTEST_OS_LINUX
+#if GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
   // On Linux, invalid format spec should lead to an error message.
   // In other environment (e.g. MSVC on Windows), String::Format() may
   // simply ignore a bad format spec, so this assertion is run on