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

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

Change-Id: Ibc4cb0a638b0bd9c67d103546a35126780647b42