Bring back Trebuchet to build

Change-Id: I316e877f7ebc72ab6519e2ffc7e829354f153869