[automerger skipped] Merge "Rust protobuf 2->3: Update build system" into main am: cd11c9535f
am: 1e95f792a6
-s ours
am skip reason: Merged-In I1d07c433aca41ccfe2e710821cf930c413dc12d6 with SHA-1 28216dbe8d
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817733
Change-Id: Ia728d2dbe61f80446d3383a4df22ad5443f17d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: