Overlay restructure (combine overlay and overlay-cdma), add eri.xml for correct carrier names in UI