Update overlays

* Comment out feature dependent configs and remove configs that match AOSP defaults