Remove six

Python 2 is no longer supported, thus usage of six can be removed.

Change-Id: I60259f7b326ac862409b4d8a0591859a0f070e8b
7 files changed