Revert "Use the AOSP RIL class"

This reverts commit a8d938804a22c19f4ff1f82a6a25503f41a36769.