Make contenttest harness build again.
auto merge of #564 : jdm/servo/contenttest, r=metajack