Remove unnecessary overlays

Change-Id: I4dac7a305562b134aa49d0d58f1ceec2ce78e439
Merge "Remove unnecessary overlays" into kitkat