Re-add GWToolset

Change-Id: I326e5c45065d0b585e4390bac2d359c63a173287