Merge "The latest version of finalization scripts." am: 30aeecb6 am: bcc2f1b3

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



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