Misc changes.

Looks like I accidentally committed text files with CRLF. Fixed.
Build test, just to make sure the build still works.  No code changes.