Remove Trebuchet overlay

This is outdated and breaks the new Trebuchet

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