Merge "Fix Windows adb build."