Remove trailing spaces in debug log

We had a few trailing spaces in debug log.  My favorite pager (vim)
highlight trailing spaces with red characters which is slightly
annoying.

Change-Id: Ibd8aa4286d185b1b59d88352e68c6201a47e481d
Merge "Remove trailing spaces in debug log"