Fix copyright headers not passing the validation

Also let through some other formatting changes that Eclipse insisted on
when saving the touched files.

Change-Id: I319de35c4862555b010d6da6d4a5e096619e2c34