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

Change-Id: I9711ce90493b7b311ae04fe5c4b25739cb57dbc2