manifest: Trebuchet

Change-Id: I387b177bd86d836efc15578fe6497cc20c18cf48
Revert "manifest: Trebuchet"

This reverts commit 9a47f558c7b1a9efe80b61f1edd512fe6e6d96f8.

The needs to be rebased without the package rename before we bring it in.

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