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

* commit '12e3a5019a8bedcdac27470da92f81b5f7fd7b5b':
  Fix pthread_test to work with gtest 1.7.0.