Summary: make the builder aware of SKID/AKID, break the internal circular dependences Reviewed-by: mullan
