Normalize line endings

Change-Id: I328a1d3505471c65681dccdaa1a342dbb9c9ab37
Merge changes from origin/7.1

f4fa4e8 Normalize line endings

Change-Id: I48ccf40262eb600b4cbc45e49abb5d5a6258b2db