Fix hacking rule H236

H236  Python 3.x incompatible __metaclass__, use six.add_metaclass()

Change-Id: I9c52563203366a7a5cc936b57525402e9c877140