Normalize whitespace to spaces:

* Keep blank lines, but don't include consecutive spaces on them.

Change-Id: Ib694dc42f718dbc747c0f627a6391d9a49075514