merge back some updates to ril that got reverted during merge

Change-Id: Ie468262d19dd18f8c6b60906ed7d7865d96347b4
remove deperciated code

Change-Id: I7beb189a3177ff694c90f48da6e03216fd6d229b