Merge "Some Assorted WebKit Test Fixes" into froyo