Merge "More finalization script fixes." am: aa055f06

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



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