Merge "Enable extra_traits feature, as it is required by nix crate." am: bed4359285 am: 678992d478 am: 8839f19979

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/1441337

Change-Id: I079a70a9ef960f7f61301cc1843312cd092ecb29