Merge "Change order of output to better match cargo2android.py." into main