[MS.Build] more cleanup (remove debugging, kill extra code).
[MS.Build] more cleanup (remove debugging, kill extra code).
Merge branch 'master' into msbuilddll2