Also organize some of the imports. Now that Servo only uses Python 3,
this module is unnecessary. This is part of the gradual migration to
using only Python 3.
This is copied from gecko, which is slightly unfortunate. However it allows
committing changes to wpt directly in-tree and having them upstreamed in the
next update.