Add jfltecri, jfltecsp support. This finishes up most US CDMA S4s.

Conflicts:
	prebuilt/common/etc/apns-conf.xml

Change-Id: Iafdb1db941fe739244ef09573ae5db9b3e7a3d96
Merge fix