Merge "Remove logic for platform stlport gtest."