Remove CRLF line endings

Change-Id: I570d53e73e5c5ff1c1f15bc049b7e4714ff4ea76
Merge "Remove CRLF line endings"