Merge build tool updates from trunk. Also, modify MSVC makefile to allow for debugging of build tool issues.

FossilOrigin-Name: b2a2fdb0ac8d27efe3036fc49941279e24de6211