Merge "finalize_branch_for_release.sh: avoid envsetup.sh" am: ac7eeb78 am:...

Merge "finalize_branch_for_release.sh: avoid envsetup.sh" am: ac7eeb78 am: 53a766a4 am: 598b4c41

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



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