Update GWToolset

Change-Id: Ie67ffd097596b2713c3e1bec81cec271a9fc689a