Get rid of CM-specific overlay stuff

Change-Id: Ibb0ef6c5c39c3e31841ac07a42889a8136d8ae9a