Re-run cargo2android.py and fix up results.

Test: atest -c -m --include-subdirs .
Change-Id: I755cd12edf2f7f8ff8b5258f9d34b3f3af02fe5d
6 files changed