manifest: Trebuchet

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