Revert hardware/ril to before qcom merge