Merge "adbd: fix build breakage." am: 5f241c7de5 am: fae10c236a

Change-Id: Iff96e234ca3666827027de159d73be52b6c01c3d