Fix cfg for linux/android
Merge pull request #109 from servo/rustup-20141105

Fix cfg for linux/android during rust upgrade