Merge changes I78fcb83c,I52b09ed1 am: dff32d756c am: 017f483e62 am: 333f824b2a

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

Change-Id: I6304854183aaeedb26dece2fb78e3f15265fc75c