Merge changes from topic "roll-rust-1.47.0" am: 567f46fe63 am: c0d8ab304c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1486077

Change-Id: Ibf30b8b16297bdc06309d4364605ea60f78d844e