Merge "adb: fix build breakage."