Convert Windows to Unix style line endings

This is more consistent with other files and fixes
Hacking warning H601.

Change-Id: I2ba5436df78dc82ca48bf53bc178106edd514f4c
Merge "Convert Windows to Unix style line endings"