Merge "adb: don't spew to logcat when tracing is enabled."