add new RIL & cleanup

Change-Id: I0f078b5b7be6b973155fb6b5ee70547f78955c1a