Merge "adbd: improve thread names." am: 39071a5177
am: bc3d3625d5

Change-Id: I5c64bbe5e535b87162cedd8cf28dad3c1174c44d