Remove Trebuchet overlay

This is outdated and breaks the new Trebuchet

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