We were inserting excess newlines in several places.

Change-Id: I746334d3696e9e3be585ab02074384ae63535ea5
Reviewed-on: https://chromium-review.googlesource.com/210823Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nicolas Capens <capn@chromium.org>