Fixing gingerbread compiling and mms for non VM carriers

This commit broke compiling http://review.cyanogenmod.com/#/c/20475/
I didnt realize i missed some aspects that were left in from ics and fixed
those back and added in the code, in a more os consientious way. Without this
patch GB will not compile

Change-Id: I1a8585755e5d8d9714224ce765b6579108af1a83