Merge changes I891f64fb,I6182d84e

* changes:
  logcat: Fix buffer size
  UsbTransportSniffer: Defensively use 'final'