Merge pull request #40 from metajack/revert-skia-dep

Revert #22.
support android build
Merge pull request #42 from webconvforge/PRcandidate

support android build
Update to latest Rust
More Rust version updates
Merge pull request #44 from kmcallister/rust-upgrade

Update to latest Rust
Merge pull request #45 from kmcallister/rust-upgrade

More Rust version updates
Update to latest Rust
Merge pull request #46 from kmcallister/rust-upgrade

Update to latest Rust
Switch from -o to --out-dir.
Revert to using -o for tests
Merge pull request #47 from kmcallister/otest

Revert to using -o for tests
Merge branch 'master-upgrade'

Reverted commits that weren't on that branch. Those commits are now on
cpu-rendering branch.