Revert "Switch to common RIL"

This reverts commit 3c8ff17354bd6470287436c56ff72703ffaae6c9.