Don't use six on release-1.7.x.

A change I crossported used six.text_type. Since this doesn't exist here, don't
use it.
Merge branch 'release-1.7.x' into release-2.0.x