mako: Switch to World APNs list

No longer needed since cdma and gsm apn lists were merged in 413017b

Remove gsm.mk to use the World APNs list

Change-Id: Id9e7fa705f72ade31d2b4b92ea6b3adb3606a9d9
mako: remove expandedDesktop overlay

not used anymore

Change-Id: Id901ce5ae5d8a1799b5514465667544752accc81
Merge "mako: Switch to World APNs list" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2