Merge "More finalization script fixes." am: aa055f06 am: 7154ed28 am: c5328baa

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



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