Merge "Latest finalization scripts." am: 3db8f0a6

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



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