python2 is no longer supported so let's drop six as well. Change-Id: I2fef470423765a9c432d33e56edf93d08254b5c9