roll gtest 621:629 and gmock 405:410

testing/gtest.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'gtest',
       'type': 'static_library',
       'sources': [
@@ skipping 110 matching lines @@
             ],
           },
         }],
         ['OS=="android"', {
           # We want gtest features that use tr1::tuple, but we currently
           # don't support the variadic templates used by libstdc++'s
           # implementation. gtest supports this scenario by providing its
           # 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',
             ],
           },
         }],
         ['OS=="win" and MSVS_VERSION=="2012"', {
           'defines': [
             '_VARIADIC_MAX=10',
           ],
           'direct_dependent_settings': {
             'defines': [
               '_VARIADIC_MAX=10',
@@ skipping 52 matching lines @@
     {
       'target_name': 'gtest_prod',
       'toolsets': ['host', 'target'],
       'type': 'none',
       'sources': [
         'gtest/include/gtest/gtest_prod.h',
       ],
     },
   ],
 }