[0.2] Backport two pull requests#3833

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

tgross35:backport-potatotgross35/rust-libc:backport-potatoCopy head branch name to clipboard