libril: revert recent changes to match jellybean branch.

Lets see how this goes with all the other reverts

Change-Id: I91dc230184584e3badbbf3f8b8da93252e9ae53b

Conflicts:

	libril/ril.cpp
	libril/ril_commands.h
	libril/ril_unsol_commands.h
	libril/telephony/ril.h
libril: latest ruby ril (EV)

Change-Id: I60ecde4c8fa27a63ef4eb061748d3f23f199a94a