Fix build for Rust master.
Fix test build for Rust master.