Android Rust Upgrade fixes

r? @metajack