roll gtest 621:629 and gmock 405:410

testing/gtest.gyp

Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 9dfb16f79b30d26aca6178f007a0cffc995adceb..7c225e8e1bd5df701aff7337d1b42eefb8d83ec9 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -128,10 +128,15 @@
           # own implementation but we must opt in to it.
           'defines': [
             'GTEST_USE_OWN_TR1_TUPLE=1',
+            # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
+            # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
+            # automatically on android, so it has to be set explicitly here.
+            'GTEST_HAS_TR1_TUPLE=1',
           ],
           'direct_dependent_settings': {
             'defines': [
               'GTEST_USE_OWN_TR1_TUPLE=1',
+              'GTEST_HAS_TR1_TUPLE=1',
             ],
           },
         }],