ril: final cleanup

Change-Id: Iba11c40b84e28be5b9227c02dd9a58f737be196e