Merge "adb: fix build breakage." am: 14d7cdce51
am: a4c4ef463b

Change-Id: I49766025464814d15029196a080477f6b8aa5215