Various compile fixes for android rustup (link still fails).