To detect wix correctly
Merge pull request #2594 from yugangw-msft/buildscriptbug

(Re-submit per recent folder restructuring)To detect wix tools correctly