Update copyright headers from before 2011, and a couple of new ones that
were merged after the previous change to copyright headers.

Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>