am 6a18a077: am 04cf629b: Move RILD to class main

* commit '6a18a07774123c409cefd9a92f1c4c6504f4edfd':
  Move RILD to class main