Fix CRLF line ending issues.

TBR=sebmarchand@chromium.org
BUG=

Review URL: https://codereview.appspot.com/159320043