Merge "adb: don't spew to logcat when tracing is enabled." am: 28c44863f6
am: b652ac4bd8

Change-Id: I47e464c9d9e50e67cde76340f9109f28cc3845a2