Initial ril  fixes for cm12.0

Change-Id: I98f38d8e6789d7c62dcc92508817275a36fc5420