Merge the latest version of Speedometer 2.0 to browserbench.org against at r222534.