This repo does not support Python 2 anymore, so we don't need
six for compatibility between Python2 and 3, convert six usage to Python
3 code.
Note that six.text_type is "str" in Python 3, so we can remove the
clause completly.
Change-Id: Icfb44404971b18ff865e28e551687707d52f3762
a150665d56