Fix cargo2android.

Test: Ran cargo2android.py
Change-Id: I3689bc352a5eab9bbcd6448d52c97fdeb9f2156e
7 files changed