Merge pull request #5 from larsbergstrom/android_20140408

fix for rust update
Merge pull request #6 from larsbergstrom/rustup_20140410

Rust upgrade
Use new inner attribute syntax
Merge pull request #7 from Manishearth/master

Use new inner attribute syntax
Rust upgrade: Explicitly import c_schar, turn off lint
Merge pull request #8 from Manishearth/rustup_20140510

Rust upgrade: Explicitly import c_schar, turn off lint
s/~str/String/