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

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

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