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