Merge "Set crate_root rather than srcs." into main