Change six.moves imports --> util.py3compat