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

Change-Id: I7ffbccc51da291fa81d2e86ca7671fc077c5ddb9