Merge "Use a wrapper around cargo2android.py." am: 08af5ca7e7 am: 7a83523dc8 am: ae734788fe

Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1698941

Change-Id: I61f9c93cc24e076f15647ffedb6ed0a22d7b1ea2