Merge "Cleanup cargo2android.py."