am 63990cf5: Merge "Move rild to the core class." into honeycomb

* commit '63990cf56fc64033c0382ac19a3ffba7f525fb30':
  Move rild to the core class.