Merge "Upgrade rust/crates/structopt-derive to 0.4.16" am: 6a8fd71e87

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1833387

Change-Id: I707ca0c245061f9f3f00caa6b98f78c24531a52f