Merge remote-tracking branch 'goog/master' am: d7fc6efe7d am: 9f30e963c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/15788263

Change-Id: I589c196c3be41229cb51deca8861296790549830