Trebuchet: Remove overlay

Change-Id: I368fe62427b2e5b09fbef906718b61f1231e50d7
Merge "Trebuchet: Remove overlay" into cm-10.1
Vendor: Add the LockClock app (part 2 of 3)

Change-Id: I152c9ddca2d5508819404d1c18c257f752da5749
try to solve conflicts