am 7d0b4ada: am 6562c151: Merge "adb: clean up debug tracing a little."

* commit '7d0b4ada0bf539a0f48b00e211799400aa733f4d':
  adb: clean up debug tracing a little.