Fix cli generation for cloner a bit
Fix cli generation for cloner a bit

Make sure we have all the appropriate bits we need, in the places we
need them.

mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge,mozilla/stoneridge