[0.2] Backport two pull requests#3873

tgross35 merged 3 commits intorust-lang:libc-0.2rust-lang/libc:libc-0.2from

tgross35:backport-cilantrotgross35/rust-libc:backport-cilantroCopy head branch name to clipboard