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

* commit '9bbc68dd0782966b3e5e583afabb7b94c02e860a':
  adb: clean up debug tracing a little.