Fix rust-servo branch’s build error.
Fix rust-servo branch’s build error (rest).
Merge branch 'rust-servo' into rust-mac: Rebase merge rust-servo (will be backed out immediately after).
Revert "Merge branch 'rust-servo' into rust-mac: Rebase merge rust-servo (will be backed out immediately after)."

This reverts commit ff8ba4ef0011407332b3b1267a72dff9bd8232d1, reversing
changes made to 747a1f0f2dae57aeff1eb32b594ebbc2b287b848.