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

Conflicts:

	config/cdma.mk
	config/common_full_phone.mk
	config/common_mini_phone.mk
	config/gsm.mk
	proprietary/cdma/etc/apns-conf.xml
	proprietary/gsm/etc/apns-conf.xml