5ba2fd7d33
Make the builder aware of SKID/AKID, break the internal circular dependences Reviewed-by: mullan
Make the builder aware of SKID/AKID, break the internal circular dependences Reviewed-by: mullan