Merge "Fix Mac adb build."