Move settings for APN and SPN into gsm.mk so that it is actually copied (this should hopefully fix the telephony issue on htc bravo)