Merge "adbd: fix build breakage." am: af40ce7d57 am: eeb50d0a88

Change-Id: Iff96e234ca3666827027de159d73be52b6c01c3d