Remove Trebuchet overlay

This is outdated and breaks the new Trebuchet

Change-Id: Ic41a9007ed2918a39b416010abe2f54a77c94f9e
Merge branch 'cm-11.0' into martincz