Added/Removed spaces around string concatenation

And added/removed spaces around some other tokens,
like +, -, *, /, <, >, =, !

Fixed windows newline style

Change-Id: I0b9c8c408f3f6bfc0d685a074d7ec468fb848fc8
Merge "Added/Removed spaces around string concatenation"