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

Change-Id: I497739c7573be43483fd801ec2083f66fa425305