Changelog: Add M11, remove M6

Change-Id: I6406f321510671a443a81b4e777b02d501394530
Merge remote-tracking branch 'cyan/cm-11.0' into cm-11.0