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 CyanogenMod

Conflicts:
	config/cdma.mk
	config/gsm.mk
	prebuilt/common/etc/apns-conf-cdma.xml

Change-Id: I3399a06efc57faa314cbf5051a7cf188274f38e0
vendor: Readded China Mobile APNs

Change-Id: I2af61a8882fae1d7af881ffacce096a1d82d448a