Revert some unused overlays from a CM cherry-pick

7e173ad

Change-Id: I82d376cb4ffe0486e16a88ed9a80656e377f643e