Be more consistent about style and copyright headers.

Yeah - we had to change our checkstyle to not forbid this, since it's totally not a style violation of google. But it's also not wrong style, so to harmonize with you folks a little, let's leave this compatible with both.