am 16785a5b: am db037bcd: Merge "Make atransport be a real class."

* commit '16785a5bd804c059c08bf49259bb78de4145aa8c':
  Make atransport be a real class.