Using six.add_metaclass

Using six.add_metaclass instead of '__metaclass__' for Python 3.x
compatibility.

Change-Id: I04848196c8bc553fec19dd447a8fdd6dacdf64b8
Merge "Using six.add_metaclass"