Merge "Revert "Make the target_files zip reflect the recent partition change""...

Merge "Revert "Make the target_files zip reflect the recent partition change"" into main am: f576d31d am: 06e9b5d7

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



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