fix-up licenses

Change-Id: Ic9634ecf8667309c735a28c3ccb649595d81bae5
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1