Merge "Patch zips makefile to properly use private variables" into main am: 4caa319d

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



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