Made end-of-lines consistent in 2 files

These files are built on Windows.  The end-of-lines were all Windows,
except for the copyright  / license notices at the front.  Those lines
were changed from Unix EOLs to Windows EOLs so the files look correct
when viewed with notepad on Windows.

Change-Id: I215f70c93f99a0674e782f0a6dd8d2d35e71f081
Merge "Made end-of-lines consistent in 2 files"