Merge "Update scripts to reflect most recent state." am: 3b120beb

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



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