Remove some more hard CR-LF lines. These were particularly weird as they were

only a few lines of the file. Also set their properties to have explicitly
native eol sytle.

llvm-svn: 130124