Remove all usage of six library

Replace six with Python 3 style code.

Change-Id: I724eba28d1a88317655f9cb7da94716772cd01ab
20 files changed