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

Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332ea am: 1c1740fa

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



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