Merge changes I61f19621,I70faef33

* changes:
  Get rid of RIL version.
  Set radio state to unavailable when rild crashes.