Merge "Add packages used to build the Windows SDK"