Update license headers on select source files

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
Include full license text

The Apache 2.0 license requires that you include a copy of the license
text in the source code distributed under that license.

Change-Id: I0fd94cece535fbe18bf94c7128e412942e6e30b9