Merge change 9243 into donut

* changes:
  Clean up RIL_SIM_* in RILConstants