Merge "[adb] Optimize adbd's usb reading" am: 4372726afd
am: faa9de5223

Change-Id: Ic39f01917770557cba0a66685a89b66c4d22f706