Merge "Cleanup cargo2android.py." am: 169b7827ed am: e9a82cd1d7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia71dc2f9ed1bf092f084c22e998ea246001731b1