cm: Add Trebuchet back to the build

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