Change to new RIL class

Change-Id: Ice707ec1268aae18b03aacab3585fcd4e67ff45e