Fix align of block comments

Change-Id: I88ea33a125a71671886b49e4ebf4c1d0a1cce572
fix some spacing

Added/removed spaces around logical/arithmetic operator
Reduced multiple empty lines to one empty line
Removed wrong tabs before comments at end of line
Removed too many spaces in assigments

Change-Id: I2bba4e72f9b5f88c53324d7b70e6042f1aad8f6b
Merge "fix some spacing"