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

Change-Id: Ia2c744bda3ea2e630991e7622b919e3dc5e983b2