am 8df7653d: Merge "Remove logic for platform stlport gtest."

* commit '8df7653d5608e5d459758a91e6c677c7d5fcc43f':
  Remove logic for platform stlport gtest.