Drop obsolete ordereddict requirement.

Change-Id: I6b5a1391a30796bc98c8ffb9d9f2b72072337f31
Merge "Drop obsolete ordereddict requirement."