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