am 44ec5822: Merge "Use text based trace masks for adbd."

* commit '44ec58221f0128bf6ea31d49bb80dde8db083379':
  Use text based trace masks for adbd.