Fix trailing whitespace in several files

Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02
7 files changed