Merge "cargo2android.py: Support cargo_pkg_version flag." am: d90e7066f6

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

Change-Id: I0bf9833da1070a01a5721a86282cc1f3502393b3