am 04cf629b: Move RILD to class main

* commit '04cf629be5e99a3a920aecc0b059444bd07e9d84':
  Move RILD to class main