Updates from TheMuppets Repo

Changes relate to the change to the Open RIL and are required to support the changes made to the CM device repos. 

Builds without these changes will not fail but you will not be able to make phone calls.