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

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

Change-Id: Ia418c0048300da8d0ed4d017121e8f8fa44681be