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 am: 54cbd895

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



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