Revert "Revert "manifest: Trebuchet""

Blockers are all out of the way, lets do this thing.
This reverts commit fd42a60e05f2bee1a29f78a5ab48d1a6b79eadaf.

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