Merge "adb: clean up debug tracing a little."