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

* commit '71b0d7b25065b2be35248380c3b98b0f77d27bd6':
  Remove logic for platform stlport gtest.