am 578a4348: (-s ours) am 4f3e9427: Merge "curl: Fix imported/exported includes."

* commit '578a4348ef7bf9497ae4123b617b88e04d21c3c9':