cm: Add Trebuchet back to the build

Change-Id: Icbb6267a547e4022c6fc5382a33ba75e257006d9
(cherry picked from commit 8deec444c85e6a6c8ea49662477980b7a170d4b1)

Conflicts:
	config/common.mk