revert part of commit 6f50961e69 remove more rtl::OUString and OString prefixes Change-Id: I026f8175c855a20bab54940f6235bca5c91ddbab
6f50961e69