Python2.6 syntax fixup

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

Change-Id: I29d5ef410a911b63cda09dc2bc4646359e1769a9