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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie28114b8153e8e30fd36ce36cf99d9e1b251dbad