Once a top-level LICENSE file is included, pep8 will compare the license
header of a source file to its expected value and complain if they don't
match. This patch re-formats the headers in question to please pep8.
No license content is changed, only formatting.
Change-Id: I0f1318b23f343523ca679ca331ef6f9f7084ebc2