jf: revert ril changes

Change-Id: I924aa6353e759d283538fc3a60cdf55e5a8e21af
Merge branch 'cm-10.1' into martincz