Use six.iteritems() rather than dict.iteritems()

This is compatible with both Python 2 and 3.

Change-Id: I6fe3e9bf9ece699badbdb9933118af90642a91e9
Merge "Use six.iteritems() rather than dict.iteritems()"