Iherit cdma config and cleanup

Change-Id: I0865e919598308ab870bf1c1705fddecfa0252b3
merge CyanogenMod

Change-Id: I99501e775909912e03e374efc83949f7c4b75381