Merge "Replace android::String8 with std::string"