Merge "Fix Win32 adb build (for the second time today)."