Revert the previous script changes, run the finalization, and then the
build.
Useful to cross check the broken branch - do we just need to re-run the
script, or is there a bigger problem.
Bug: 243966946
Test: run locally
Change-Id: I44d6a5f5f523001ae70e5b82315ffbad82a1233d