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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ed68513be3aacaafa1366668ae0711be22aed61