adapt ril to upstream

Change-Id: I5bd4af958bd90f0979324d3177bd83ff403bf12e