Android Rust Upgrade fixes
Merge pull request #39 from mozilla-servo/rustup_20140510

Android Rust Upgrade fixes