Merge "Remove use of __uint32_t in Rust code"