Revert "Revert to old RIL"

This reverts commit 84b2e9a692ebe65080a5a81a651614d965b2d112.