Revert "New RIL API"

This reverts commit f722e82d9f6a674c4c9c3400f5579795e32f464f.