Merge "Change order of output to better match cargo2android.py." into main am: 35006bae06

Original change: https://android-review.googlesource.com/c/platform/development/+/2799378

Change-Id: Idfb881e9b22eb81fa05cc8c8991a26443994c27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>