am 037b10d0: Merge "Fix pthread_test to work with gtest 1.7.0."

* commit '037b10d05a789eb57878127ee4d69db1008e8c80':
  Fix pthread_test to work with gtest 1.7.0.