Fix RIL errors and follow this commit: https://github.com/CyanogenMod/android_frameworks_opt_telephony/commit/873f5a8692bcfa5b8394c95b2783f6bad7653a28