overlay: Trebuchet: Follow base package changes

Change-Id: I550bf360864621f3ccc2859e70eb1597f88ce11a
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2