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

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

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



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