Merge "Fix finalization script to upload abi prebuilts." am: 3b12fe1c

Original change: https://android-review.googlesource.com/c/platform/build/+/2324032



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