Get rid of py26 references: OrderedDict, httplib, xml testing

Change-Id: I44315e0663a7c0c82110b933b68e2b747f548859
Merge "Get rid of py26 references: OrderedDict, httplib, xml testing"