Merge "adb: fix mac build breakage." am: 52c6f1b6de
am: 94a23604c7

Change-Id: Iea69d154f5867affcd4bafdeb77d8eb90bb7059d