Remove all usage of six library

Replace six with Python 3 style code.

Change-Id: Ie0da4c882847268a58ab20f0fbc82fc8cf658297
2 files changed