Merge "Update to DumpRenderTree test harness"