Remove usage of six

Remove six-library Replace the following items with Python 3 style code.
- six.add_metaclass

Change-Id: I7da3e8898e00bc07f6e462cbc9765ce7c199faa2
5 files changed