Merge upstream Android and rustup fixes

r? @larsbergstrom