Merge "remove string8, replace with std::string from stlport" into klp-dev