Revert "adapt ril to upstream"

This reverts commit 84272694678f3799c8b383607fb810c880617098.

Change-Id: Ia34ce8b55bfe32df8dd1a41f6cf38858499311f0