Android Rust Upgrade fixes