Use the new more inclusive command-line options.

Test: cargo2android
Test: Compile
Change-Id: If0858e32a28227f8ee34f386a1dbe0853e76cdc2
2 files changed