Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." am: 774a6dbb

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



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