[0.2] Backport of two pull requests#3877

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

tgross35:backport-butternuttgross35/rust-libc:backport-butternutCopy head branch name to clipboard