Python2.6 syntax fixup

Python2.6 does not have dictionary comprehension, but we can do
something similar using the dict(...) constructor.

Change-Id: I2e91a98d6e83a6b1471ac124a7aaae2564421210