qcom-common: libril: reconcile ril with CM upstream source

Change-Id: Ic1cc8184734f4216f61264767588fc5397572d10