rhine: reconcile ril with mainline

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