Merge "Fix the Windows adb build."