Merge "Let cargo2android ensure some libraries are whole_static_libs." am: 8a91713408

Original change: https://android-review.googlesource.com/c/platform/development/+/1764605

Change-Id: Ib72a02352891a2315dd3a45dd57316007dea0127