curl: fixups after rebase to build for android

Change-Id: Ieed2046ecfaffc13ed6a29711b76426bbdb1c977