Gril rilmodem refactor

This is a general cleanup of rilmodem which is a follow-up to the re-factoring work recently finished.