serrano: Add back some RIL shit

Change-Id: Ice25617a082a678302ce1c0303f1bd85d00dc3d0
Merge branch 'cm-11.0' into kk_mkt