Fix rust-servo branch’s build error.
Fix rust-servo branch’s build error (rest).
Rebase merge rust-servo (will be backed out immediately after).