Merge remote-tracking branch 'upstream/master' into sched_getcpu

src/unix/bsd/apple/mod.rs

src/unix/bsd/freebsdlike/mod.rs

src/unix/bsd/openbsdlike/mod.rs

src/unix/mod.rs

src/unix/notbsd/android/b32.rs

src/unix/notbsd/android/b64.rs

src/unix/notbsd/android/mod.rs

src/unix/notbsd/linux/mips.rs

src/unix/notbsd/linux/musl/b32/arm.rs

src/unix/notbsd/linux/musl/b32/asmjs.rs

src/unix/notbsd/linux/musl/b32/mips.rs

src/unix/notbsd/linux/musl/b32/x86.rs

src/unix/notbsd/linux/musl/b64/mod.rs

src/unix/notbsd/linux/musl/mod.rs

src/unix/notbsd/linux/other/mod.rs

src/unix/notbsd/mod.rs

src/unix/solaris/mod.rs