Fixes: 1. Fix Windows native build error introduced in pr#2053. Correct problem of mismatched Windows/Linux newlines. 2. Remove dependency on command line tools being available.