Remove six

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

Change-Id: I1a44b65768cb862e10d013801dd47cb0510b2d07
9 files changed