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

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