cm: World Phone support

* combine apns
* leave cdma/gsm files intact but empty until the calls
* are removed from devices cm.mk

Change-Id: I0686ef4ee1fe9b34ac9beaaa2bd43555234f4f6d
apns: add 8ta APN

Add South Africa newest cellphone provider 8ta.com/telkommobile.co.za
APN values

Change-Id: If2f0c593c41c9c9d8c57d14602ee7304ba735fb0
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_vendor_cm into cd-4.3

Conflicts:
	config/cdma.mk
	config/gsm.mk

Change-Id: Ie526ecc732b0f4cd295ec9b21d7785845bbc6f73