[DF-5356] Curl windows and android build fix.