Merge "cargo_embargo: dedup lib deps" into main