Fix up some trivial license mismatches

In preparation of the Hacking check that would reject
those licenses in the future.

Change-Id: I2ba5080ed836c62fa54fa2734c2ecd3114639b75
Merge "Fix up some trivial license mismatches"