Convert short doc strings to be on one line

This patch just cleans up some one-line doc strings which were
split across 3 lines needlessly.

Change-Id: I3c2011d20fb7c3b8714d7b5a32151e427bf8a311