Fix licenses after the split topic branch merge

Change-Id: I31b9a2c1af5d42f984192b7760fad807f49a86b7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>