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: I78b35601e8d4a7fb72af69361f713b7d4dff6a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>