ril: pull some stuff from CM

...and suddenly, I had a cellphone again.

Change-Id: Idac6481f1b8cdb595c3c43eceed23c43e051196f