Merge "Fix Win32 adb build."