revert ril to pre qcom merge