Revert "Fix RIL build"

This reverts commit 38c71c7015264bcae2beb7cd4ed17016931f1c50.
Revert "RIL Update/Changes"

This reverts commit 5d2320ce67f506980d66b65eb00a32c1ed1e7108.