Revert "Revert "manifest: Trebuchet is in the default manifest now""

This reverts commit 5fd9e4c0b9e6c49884ae6fe68fb304b3fb8ace76.

Change-Id: Iff9d1ae7df77dd9b09ea029006742591857e466c
Merge "Revert "Revert "manifest: Trebuchet is in the default manifest now""" into cm-11.0