STYLE: Remove end of line spaces.

Standard git hooks were preventing commits because these files
had unnecessary end of line spaces.  Removed the end of line
spaces in order to facilitate code commits.

Change-Id: I96c8f239985962b1ca6e7240b75aad1f92565c2f
Merge "STYLE: Remove end of line spaces."