Merge "Revert^2 "Make the target_files zip reflect the recent partition...

Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0 am: a2cd1601

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



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