Python3: use six.iteritems() rather than dict.iteritems()

This is compatible with both Python 2 and 3.

Change-Id: If8c3a4a6fe028a3a1dc6899f0f4e65c89403d267
Merge "Python3: use six.iteritems() rather than dict.iteritems()"