fix-up licenses

Change-Id: Ic9634ecf8667309c735a28c3ccb649595d81bae5