Android fixes for February Rust Upgrade