Revert "Revert "Revert "Revert^2 "Add more variables for system/..." am: dd3d5c1f

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



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