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

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



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