Revert " Merge "Revert "Generic multi-carrier overlays based on hammerhead"" into kitkat"

This reverts commit 2b68f60ae5bed3550554fd80c87aa7a9a55c852c, reversing
changes made to 48f4a3c8206c546bb03a84455272bf678c4d0a9b.