Fix whitespace: remove trailing LF chars and spaces

Change-Id: I143c5b0055951d0b25dfb6c63be78230e1abf373