use cm's trebuchet

Change-Id: I13ace46e09e456b1acf82fa204168c0ff41e8376